From 7be52a964ece98ec2a9a0f0b54e8fac92c50dd6e Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Tue, 2 Jun 2026 18:53:37 +0000 Subject: [PATCH 001/220] chore: sync updates.xml 02.33.00 from main [skip ci] --- updates.xml | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/updates.xml b/updates.xml index 5d570e01..30614ca4 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -13,33 +13,34 @@ site 02.32.21-dev 2026-06-02 - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.21-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.21-dev.zip 2330a2b3278587c66a4b43e4c6d5a330a7fb2d161c0df09cd266850aabb82d82 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting https://mokoconsulting.tech - + - Package - MokoWaaS - MokoWaaS site management suite - pkg_mokowaas - package - 02.32.00 - https://mokoconsulting.tech - - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/v02.32.00/pkg_mokowaas-02.32.00.zip - - - stable - - Moko Consulting - https://mokoconsulting.tech - - 8.1 - + Package - MokoWaaS + Package - MokoWaaS stable build. + pkg_mokowaas + package + site + 02.33.00 + 2026-06-02 + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable + + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/pkg_mokowaas-02.33.00.zip + + 30e18531d9e453173c8945fdfaf690dacdcc3d584d827d146f0c86c851f49bb0 + stable + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md + Moko Consulting + https://mokoconsulting.tech + + From 4f2aea75f5af641b8823c2a991798606d3cbd2c8 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 13:54:30 -0500 Subject: [PATCH 002/220] feat: add admin submenus under MokoWaaS sidebar menu Submenus: - Dashboard (control panel) - Moko Extensions (install packages) - Feature Plugins (filtered plugin manager) - Joomla Updates (com_installer update view) - Global Check-in (com_checkin) - Cache Management (com_cache) Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/language/en-GB/com_mokowaas.sys.ini | 6 ++++++ src/packages/com_mokowaas/mokowaas.xml | 8 ++++++++ 2 files changed, 14 insertions(+) diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini index ac058b55..5e40f5d2 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini @@ -5,3 +5,9 @@ COM_MOKOWAAS="MokoWaaS" COM_MOKOWAAS_DESCRIPTION="MokoWaaS admin dashboard and REST API. Control panel for managing site features, health monitoring, and remote management." COM_MOKOWAAS_DASHBOARD_TITLE="MokoWaaS Control Panel" +COM_MOKOWAAS_MENU_DASHBOARD="Dashboard" +COM_MOKOWAAS_MENU_EXTENSIONS="Moko Extensions" +COM_MOKOWAAS_MENU_PLUGINS="Feature Plugins" +COM_MOKOWAAS_MENU_UPDATES="Joomla Updates" +COM_MOKOWAAS_MENU_CHECKIN="Global Check-in" +COM_MOKOWAAS_MENU_CACHE="Cache Management" diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index d3cca22d..7149b44c 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -27,6 +27,14 @@ MokoWaaS + + COM_MOKOWAAS_MENU_DASHBOARD + COM_MOKOWAAS_MENU_EXTENSIONS + COM_MOKOWAAS_MENU_PLUGINS + COM_MOKOWAAS_MENU_UPDATES + COM_MOKOWAAS_MENU_CHECKIN + COM_MOKOWAAS_MENU_CACHE + language services From 3d3c9188485d5403df758b9668a115c7144fb284 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 18:54:53 +0000 Subject: [PATCH 003/220] chore(version): auto-bump 02.32.22 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index c8a9eb8f..47acc776 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.21 + 02.32.22 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index f33f15c1..a5c5111c 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.21 +# VERSION: 02.32.22 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 10eff570..3635cf1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.21 + VERSION: 02.32.22 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2c28193a..070d3b03 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index e050316e..5879fd5a 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 42b9353a..4871e339 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.21 + VERSION: 02.32.22 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index f52baaec..ce469ee2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 9df1a2a6..c23227c4 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.21 +VERSION: 02.32.22 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 34cf61be..b6ff5ff0 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.21) +# MokoWaaS Build Guide (VERSION: 02.32.22) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 9b1e0976..3ea18bdb 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.21) +# MokoWaaS Configuration Guide (VERSION: 02.32.22) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 526b98a7..056ce53e 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.21) +# MokoWaaS Installation Guide (VERSION: 02.32.22) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 025a822d..082612f4 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.21) +# MokoWaaS Operations Guide (VERSION: 02.32.22) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 55df494a..47984738 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.21) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.22) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index f3ca57f5..0e231832 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.21) +# MokoWaaS Testing Guide (VERSION: 02.32.22) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index f75fd423..67566bac 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.21) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.22) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 86ae2dd7..d727437b 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.21) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.22) ## Introduction diff --git a/docs/index.md b/docs/index.md index c9303593..3d20bb47 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.21 + VERSION: 02.32.22 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.21) +# MokoWaaS Documentation Index (VERSION: 02.32.22) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 6c36ff89..58728352 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.21 + VERSION: 02.32.22 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.21) +# MokoWaaS Plugin Overview (VERSION: 02.32.22) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 0059d11b..474de512 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.21 +VERSION: 02.32.22 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 7149b44c..842bae90 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 8e6ec270..f17381e2 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index badd115f..54a81062 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 2aa3e657..857529f8 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 7ed749d9..b970247a 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index ea475f69..63083af9 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 9b280b3a..d15bf3eb 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index f8dc2b2e..9a19c582 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 4081b99b..9e5d1a0c 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 557bc543..17951218 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.21 + * VERSION: 02.32.22 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 099e905f..41bb0da1 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.21 + * VERSION: 02.32.22 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index f1865e47..7a840d63 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.21 + * VERSION: 02.32.22 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 61b33c06..c85131de 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 4be9dd0a..00d2fe72 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 2ba926e8..b03a91ba 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.21 + * VERSION: 02.32.22 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 39ad9503..385c9336 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index ca986100..adfdbd84 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 82883089..911fddeb 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index abe6efa7..13322acd 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index bfb55459..7410b707 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 - 02.32.21 + 02.32.22 + 02.32.22 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index c5009f9f..2d858016 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 + 02.32.22 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 96526391..11387335 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 - 02.32.21 + 02.32.22 + 02.32.22 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index fbbecc34..fd029e4b 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.21 - 02.32.21 + 02.32.22 + 02.32.22 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 88a41a08..89e9f31d 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.21 + * VERSION: 02.32.22 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 9b8f8b54..787f3c7f 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.21 + * VERSION: 02.32.22 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 0404390a..7aa72f94 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.21 + 02.32.22 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 30614ca4..662892ef 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 5d94419d9f410143c918090b9ae402369f60d01c Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 18:54:54 +0000 Subject: [PATCH 004/220] chore: update development channel 02.32.22 [skip ci] --- updates.xml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/updates.xml b/updates.xml index 662892ef..eabcb02f 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -11,18 +11,18 @@ pkg_mokowaas package site - 02.32.21-dev + 02.32.22-dev 2026-06-02 - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.21-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.22-dev.zip - 2330a2b3278587c66a4b43e4c6d5a330a7fb2d161c0df09cd266850aabb82d82 + d96e622418b04747079620c36d95e2d054a8652eaf22ae756cad6177d27ebdcf dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting https://mokoconsulting.tech - + Package - MokoWaaS @@ -32,15 +32,15 @@ site 02.33.00 2026-06-02 - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/stable - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/pkg_mokowaas-02.33.00.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/stable/pkg_mokowaas-02.33.00.zip 30e18531d9e453173c8945fdfaf690dacdcc3d584d827d146f0c86c851f49bb0 stable https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting https://mokoconsulting.tech - + From 6a02a2b4e5bca5e4e154e8692d81e7aee4f62c6d Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 13:56:58 -0500 Subject: [PATCH 005/220] feat: add all quick action buttons to dashboard + Community Builder detection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 8 action buttons in a 4-column grid: - Clear Cache, Check Updates, Moko Extensions (primary) - Global Check-in, View Logs, Scheduled Tasks, User Manager, Redirects (secondary) User Manager auto-detects Community Builder — links to com_comprofiler if installed, otherwise com_users. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/tmpl/dashboard/default.php | 52 ++++++++++++++++--- 1 file changed, 45 insertions(+), 7 deletions(-) diff --git a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php index c8922884..6b879fae 100644 --- a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php @@ -68,24 +68,62 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
-
+
-
+
- + Check Updates
-
+
- + Moko Extensions + +
+
+ + + Global Check-in + +
+
+ + + View Logs + +
+
+ + + Scheduled Tasks + +
+
+ + + + + +
+
+ + + Redirects
From a013755ce45ae4b0201c070d4f76c75d85d5f451 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 18:57:17 +0000 Subject: [PATCH 006/220] chore(version): auto-bump 02.32.23 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 47acc776..30f1a9af 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.22 + 02.32.23 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index a5c5111c..bf5f395e 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.22 +# VERSION: 02.32.23 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 3635cf1f..f9a7677a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.22 + VERSION: 02.32.23 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 070d3b03..855c752b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 5879fd5a..335fdad9 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 4871e339..f00a1a96 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.22 + VERSION: 02.32.23 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index ce469ee2..0f4de268 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index c23227c4..1ef67735 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.22 +VERSION: 02.32.23 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index b6ff5ff0..f487040d 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.22) +# MokoWaaS Build Guide (VERSION: 02.32.23) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 3ea18bdb..0c41a28b 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.22) +# MokoWaaS Configuration Guide (VERSION: 02.32.23) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 056ce53e..2ab661a2 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.22) +# MokoWaaS Installation Guide (VERSION: 02.32.23) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 082612f4..1d859faa 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.22) +# MokoWaaS Operations Guide (VERSION: 02.32.23) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 47984738..d976a1fd 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.22) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.23) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 0e231832..1e85ffd2 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.22) +# MokoWaaS Testing Guide (VERSION: 02.32.23) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 67566bac..3021f709 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.22) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.23) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index d727437b..0e0efed0 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.22) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.23) ## Introduction diff --git a/docs/index.md b/docs/index.md index 3d20bb47..4b79c2eb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.22 + VERSION: 02.32.23 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.22) +# MokoWaaS Documentation Index (VERSION: 02.32.23) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 58728352..59d92428 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.22 + VERSION: 02.32.23 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.22) +# MokoWaaS Plugin Overview (VERSION: 02.32.23) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 474de512..95f332cd 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.22 +VERSION: 02.32.23 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 842bae90..e764248b 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index f17381e2..b3187da2 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 54a81062..7f281cfb 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 857529f8..36d8c0c1 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index b970247a..733a52b2 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 63083af9..3c90e6db 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index d15bf3eb..e560e8f4 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 9a19c582..a1dcc0d1 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 9e5d1a0c..21fc160a 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 17951218..110a1876 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.22 + * VERSION: 02.32.23 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 41bb0da1..d7ee2467 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.22 + * VERSION: 02.32.23 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 7a840d63..5f0e52cf 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.22 + * VERSION: 02.32.23 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index c85131de..443037b6 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 00d2fe72..d059fcce 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index b03a91ba..0657ee47 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.22 + * VERSION: 02.32.23 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 385c9336..e1c038c8 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index adfdbd84..8be67a2c 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 911fddeb..373fd212 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 13322acd..a5383f16 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 7410b707..94266b79 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 - 02.32.22 + 02.32.23 + 02.32.23 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 2d858016..b0f5bf94 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 + 02.32.23 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 11387335..637c44c6 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 - 02.32.22 + 02.32.23 + 02.32.23 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index fd029e4b..2fb307bd 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.22 - 02.32.22 + 02.32.23 + 02.32.23 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 89e9f31d..132f8da4 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.22 + * VERSION: 02.32.23 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 787f3c7f..254b1536 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.22 + * VERSION: 02.32.23 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 7aa72f94..68ec3b55 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.22 + 02.32.23 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index eabcb02f..d981bec7 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 0632981d8895669116e2514ce444409847832d71 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:05:25 -0500 Subject: [PATCH 007/220] feat: .htaccess / NginX configuration maker (#123) GUI-based server config generator with toggle switches: Security: directory listing, sensitive files, PHP in uploads, server signature, clickjacking, MIME sniffing, XSS, TRACE/TRACK, referrer policy, HSTS, CSP, permissions policy Performance: GZip compression, browser caching with configurable expiry times, ETag control SEO: www/non-www redirect, index.php redirect, trailing slash Features: - Live preview updates as toggles change (AJAX) - Save to disk with automatic .htaccess.mokowaas.bak backup - Download generated config - NginX equivalent tab - Current file viewer tab - Options persist in component params - Added to sidebar submenu Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/language/en-GB/com_mokowaas.ini | 1 + .../admin/language/en-GB/com_mokowaas.sys.ini | 1 + .../src/Controller/DisplayController.php | 67 +++ .../admin/src/Model/HtaccessModel.php | 522 ++++++++++++++++++ .../admin/src/View/Htaccess/HtmlView.php | 47 ++ .../admin/tmpl/htaccess/default.php | 306 ++++++++++ src/packages/com_mokowaas/mokowaas.xml | 1 + 7 files changed, 945 insertions(+) create mode 100644 src/packages/com_mokowaas/admin/src/Model/HtaccessModel.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Htaccess/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/htaccess/default.php diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini index 2d7a1c7e..e11af07b 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini @@ -19,3 +19,4 @@ COM_MOKOWAAS_CACHE_CLEARED="Cache cleared successfully." COM_MOKOWAAS_EXTENSIONS_TITLE="Moko Extensions" COM_MOKOWAAS_EXTENSIONS_INFO="Install Moko Consulting Joomla packages from the official release server. Updates are handled through Joomla's native System > Update mechanism — each package registers its own update server." COM_MOKOWAAS_EXTENSIONS_LINK="Moko Extensions" +COM_MOKOWAAS_HTACCESS_TITLE=".htaccess Maker" diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini index 5e40f5d2..4ec41890 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini @@ -10,4 +10,5 @@ COM_MOKOWAAS_MENU_EXTENSIONS="Moko Extensions" COM_MOKOWAAS_MENU_PLUGINS="Feature Plugins" COM_MOKOWAAS_MENU_UPDATES="Joomla Updates" COM_MOKOWAAS_MENU_CHECKIN="Global Check-in" +COM_MOKOWAAS_MENU_HTACCESS=".htaccess Maker" COM_MOKOWAAS_MENU_CACHE="Cache Management" diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index b6bdac57..6cfebbbe 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -122,4 +122,71 @@ class DisplayController extends BaseController echo json_encode($result); $app->close(); } + + /** + * Save .htaccess to disk and persist options. + */ + public function saveHtaccess() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $app = Factory::getApplication(); + $user = $app->getIdentity(); + + if (!$user->authorise('core.admin')) + { + $app->setHeader('Content-Type', 'application/json'); + echo json_encode(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]); + $app->close(); + } + + $input = $app->getInput(); + $content = $input->getRaw('content', ''); + $model = $this->getModel('Htaccess'); + + // Save options from opt_ prefixed fields + $options = []; + + foreach ($input->getArray() as $key => $value) + { + if (str_starts_with($key, 'opt_')) + { + $options[substr($key, 4)] = $value; + } + } + + if (!empty($options)) + { + $model->saveOptions($options); + } + + $result = $model->saveHtaccess($content); + + $app->setHeader('Content-Type', 'application/json'); + echo json_encode($result); + $app->close(); + } + + /** + * Generate .htaccess preview from posted options (AJAX). + */ + public function generateHtaccess() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $app = Factory::getApplication(); + $input = $app->getInput(); + $model = $this->getModel('Htaccess'); + $options = $input->getArray(); + + // Save options for persistence + $model->saveOptions($options); + + $app->setHeader('Content-Type', 'application/json'); + echo json_encode([ + 'htaccess' => $model->generateHtaccess($options), + 'nginx' => $model->generateNginx($options), + ]); + $app->close(); + } } diff --git a/src/packages/com_mokowaas/admin/src/Model/HtaccessModel.php b/src/packages/com_mokowaas/admin/src/Model/HtaccessModel.php new file mode 100644 index 00000000..5997b19c --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/Model/HtaccessModel.php @@ -0,0 +1,522 @@ + 1, + 'block_sensitive_files' => 1, + 'block_php_in_uploads' => 1, + 'disable_server_signature' => 1, + 'prevent_clickjacking' => 1, + 'prevent_mime_sniffing' => 1, + 'xss_protection' => 1, + 'disable_trace_track' => 1, + 'referrer_policy' => 'strict-origin-when-cross-origin', + 'hsts_enabled' => 0, + 'hsts_max_age' => 31536000, + 'hsts_subdomains' => 0, + 'csp_enabled' => 0, + 'csp_value' => '', + 'permissions_policy' => 0, + 'permissions_value' => '', + // Performance + 'enable_gzip' => 1, + 'enable_expires' => 1, + 'expires_html' => 3600, + 'expires_css_js' => 2592000, + 'expires_images' => 31536000, + 'etag_control' => 0, + // SEO + 'www_redirect' => 'off', + 'redirect_index_php' => 1, + 'force_trailing_slash' => 0, + // Custom + 'custom_rules' => '', + ]; + + /** + * Get saved options or defaults. + */ + public function getOptions(): array + { + $db = $this->getDatabase(); + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')); + $db->setQuery($query); + $params = new Registry($db->loadResult() ?? '{}'); + + $htaccess = $params->get('htaccess', null); + + if ($htaccess) + { + return array_merge(self::DEFAULTS, (array) json_decode(json_encode($htaccess), true)); + } + + return self::DEFAULTS; + } + + /** + * Save options to component params. + */ + public function saveOptions(array $options): array + { + try + { + $db = $this->getDatabase(); + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')); + $db->setQuery($query); + $params = new Registry($db->loadResult() ?? '{}'); + + $clean = []; + + foreach (self::DEFAULTS as $key => $default) + { + $clean[$key] = $options[$key] ?? $default; + } + + $params->set('htaccess', $clean); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($params->toString())) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + )->execute(); + + return ['success' => true, 'message' => 'Options saved.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Save failed: ' . $e->getMessage()]; + } + } + + /** + * Read the current .htaccess file. + */ + public function readCurrentHtaccess(): string + { + $path = JPATH_ROOT . '/.htaccess'; + + return file_exists($path) ? file_get_contents($path) : ''; + } + + /** + * Write .htaccess to disk with backup. + */ + public function saveHtaccess(string $content): array + { + $path = JPATH_ROOT . '/.htaccess'; + $backup = JPATH_ROOT . '/.htaccess.mokowaas.bak'; + + try + { + // Backup existing + if (file_exists($path)) + { + copy($path, $backup); + } + + $result = file_put_contents($path, $content); + + if ($result === false) + { + // Restore backup + if (file_exists($backup)) + { + copy($backup, $path); + } + + return ['success' => false, 'message' => '.htaccess is not writable.']; + } + + return ['success' => true, 'message' => '.htaccess saved. Backup at .htaccess.mokowaas.bak']; + } + catch (\Throwable $e) + { + if (file_exists($backup)) + { + @copy($backup, $path); + } + + return ['success' => false, 'message' => 'Write failed: ' . $e->getMessage()]; + } + } + + /** + * Generate .htaccess content from options. + */ + public function generateHtaccess(array $opts): string + { + $lines = []; + $lines[] = '##'; + $lines[] = '## MokoWaaS Generated .htaccess'; + $lines[] = '## Generated: ' . gmdate('Y-m-d H:i:s') . ' UTC'; + $lines[] = '## DO NOT EDIT — regenerate from MokoWaaS > .htaccess Maker'; + $lines[] = '##'; + $lines[] = ''; + + // --- Security --- + if (!empty($opts['disable_directory_listing'])) + { + $lines[] = '## Disable directory listing'; + $lines[] = 'Options -Indexes'; + $lines[] = ''; + } + + if (!empty($opts['disable_server_signature'])) + { + $lines[] = '## Hide server signature'; + $lines[] = 'ServerSignature Off'; + $lines[] = ''; + $lines[] = ' Header unset X-Powered-By'; + $lines[] = ' Header unset Server'; + $lines[] = ''; + $lines[] = ''; + } + + if (!empty($opts['block_sensitive_files'])) + { + $lines[] = '## Block access to sensitive files'; + $lines[] = ''; + $lines[] = ' '; + $lines[] = ' Require all denied'; + $lines[] = ' '; + $lines[] = ''; + $lines[] = ''; + } + + if (!empty($opts['block_php_in_uploads'])) + { + $lines[] = '## Block PHP execution in upload directories'; + $dirs = ['images', 'media', 'tmp', 'cache', 'logs']; + + foreach ($dirs as $dir) + { + $lines[] = ''; + $lines[] = ' '; + $lines[] = ' '; + $lines[] = ' Require all denied'; + $lines[] = ' '; + $lines[] = ' '; + $lines[] = ''; + } + + $lines[] = ''; + } + + if (!empty($opts['disable_trace_track'])) + { + $lines[] = '## Disable TRACE and TRACK methods'; + $lines[] = ''; + $lines[] = ' RewriteEngine On'; + $lines[] = ' RewriteCond %{REQUEST_METHOD} ^(TRACE|TRACK)'; + $lines[] = ' RewriteRule .* - [F]'; + $lines[] = ''; + $lines[] = ''; + } + + // Security headers + $headers = []; + + if (!empty($opts['prevent_clickjacking'])) + { + $headers[] = ' Header always set X-Frame-Options "SAMEORIGIN"'; + } + + if (!empty($opts['prevent_mime_sniffing'])) + { + $headers[] = ' Header always set X-Content-Type-Options "nosniff"'; + } + + if (!empty($opts['xss_protection'])) + { + $headers[] = ' Header always set X-XSS-Protection "1; mode=block"'; + } + + $referrer = $opts['referrer_policy'] ?? ''; + + if (!empty($referrer) && $referrer !== 'off') + { + $headers[] = ' Header always set Referrer-Policy "' . $referrer . '"'; + } + + if (!empty($opts['hsts_enabled'])) + { + $maxAge = (int) ($opts['hsts_max_age'] ?? 31536000); + $hsts = 'max-age=' . $maxAge; + + if (!empty($opts['hsts_subdomains'])) + { + $hsts .= '; includeSubDomains'; + } + + $headers[] = ' Header always set Strict-Transport-Security "' . $hsts . '"'; + } + + if (!empty($opts['csp_enabled']) && !empty($opts['csp_value'])) + { + $headers[] = ' Header always set Content-Security-Policy "' . str_replace('"', '', $opts['csp_value']) . '"'; + } + + if (!empty($opts['permissions_policy']) && !empty($opts['permissions_value'])) + { + $headers[] = ' Header always set Permissions-Policy "' . str_replace('"', '', $opts['permissions_value']) . '"'; + } + + if (!empty($headers)) + { + $lines[] = '## Security headers'; + $lines[] = ''; + $lines = array_merge($lines, $headers); + $lines[] = ''; + $lines[] = ''; + } + + // --- Performance --- + if (!empty($opts['enable_gzip'])) + { + $lines[] = '## GZip compression'; + $lines[] = ''; + $lines[] = ' AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css'; + $lines[] = ' AddOutputFilterByType DEFLATE text/javascript application/javascript application/x-javascript'; + $lines[] = ' AddOutputFilterByType DEFLATE application/json application/xml application/rss+xml'; + $lines[] = ' AddOutputFilterByType DEFLATE image/svg+xml application/font-woff application/font-woff2'; + $lines[] = ''; + $lines[] = ''; + } + + if (!empty($opts['enable_expires'])) + { + $html = (int) ($opts['expires_html'] ?? 3600); + $cssJs = (int) ($opts['expires_css_js'] ?? 2592000); + $images = (int) ($opts['expires_images'] ?? 31536000); + + $lines[] = '## Browser caching'; + $lines[] = ''; + $lines[] = ' ExpiresActive On'; + $lines[] = ' ExpiresDefault "access plus ' . $html . ' seconds"'; + $lines[] = ' ExpiresByType text/html "access plus ' . $html . ' seconds"'; + $lines[] = ' ExpiresByType text/css "access plus ' . $cssJs . ' seconds"'; + $lines[] = ' ExpiresByType text/javascript "access plus ' . $cssJs . ' seconds"'; + $lines[] = ' ExpiresByType application/javascript "access plus ' . $cssJs . ' seconds"'; + $lines[] = ' ExpiresByType image/jpeg "access plus ' . $images . ' seconds"'; + $lines[] = ' ExpiresByType image/png "access plus ' . $images . ' seconds"'; + $lines[] = ' ExpiresByType image/gif "access plus ' . $images . ' seconds"'; + $lines[] = ' ExpiresByType image/webp "access plus ' . $images . ' seconds"'; + $lines[] = ' ExpiresByType image/svg+xml "access plus ' . $images . ' seconds"'; + $lines[] = ' ExpiresByType font/woff2 "access plus ' . $images . ' seconds"'; + $lines[] = ''; + $lines[] = ''; + } + + if (!empty($opts['etag_control'])) + { + $lines[] = '## Disable ETags (for load-balanced environments)'; + $lines[] = ''; + $lines[] = ' Header unset ETag'; + $lines[] = ''; + $lines[] = 'FileETag None'; + $lines[] = ''; + } + + // --- SEO / Redirects --- + $wwwRedirect = $opts['www_redirect'] ?? 'off'; + + if ($wwwRedirect !== 'off' || !empty($opts['redirect_index_php']) || !empty($opts['force_trailing_slash'])) + { + $lines[] = '## SEO redirects'; + $lines[] = ''; + $lines[] = ' RewriteEngine On'; + + if ($wwwRedirect === 'www') + { + $lines[] = ''; + $lines[] = ' ## Force www'; + $lines[] = ' RewriteCond %{HTTP_HOST} !^www\. [NC]'; + $lines[] = ' RewriteRule ^(.*)$ https://www.%{HTTP_HOST}/$1 [R=301,L]'; + } + elseif ($wwwRedirect === 'non-www') + { + $lines[] = ''; + $lines[] = ' ## Force non-www'; + $lines[] = ' RewriteCond %{HTTP_HOST} ^www\.(.+)$ [NC]'; + $lines[] = ' RewriteRule ^(.*)$ https://%1/$1 [R=301,L]'; + } + + if (!empty($opts['redirect_index_php'])) + { + $lines[] = ''; + $lines[] = ' ## Redirect /index.php to root'; + $lines[] = ' RewriteCond %{THE_REQUEST} ^[A-Z]{3,}\s/+index\.php\s [NC]'; + $lines[] = ' RewriteRule ^index\.php/?(.*)$ /$1 [R=301,L]'; + } + + if (!empty($opts['force_trailing_slash'])) + { + $lines[] = ''; + $lines[] = ' ## Force trailing slash'; + $lines[] = ' RewriteCond %{REQUEST_FILENAME} !-f'; + $lines[] = ' RewriteCond %{REQUEST_URI} !(.*)/$'; + $lines[] = ' RewriteRule ^(.*)$ /$1/ [R=301,L]'; + } + + $lines[] = ''; + $lines[] = ''; + } + + // --- Custom rules --- + $custom = trim($opts['custom_rules'] ?? ''); + + if (!empty($custom)) + { + $lines[] = '## Custom rules'; + $lines[] = $custom; + $lines[] = ''; + } + + return implode("\n", $lines); + } + + /** + * Generate equivalent NginX configuration snippet. + */ + public function generateNginx(array $opts): string + { + $lines = []; + $lines[] = '## MokoWaaS Generated NginX Configuration'; + $lines[] = '## Add these directives inside your server { } block'; + $lines[] = ''; + + if (!empty($opts['disable_directory_listing'])) + { + $lines[] = '# Disable directory listing'; + $lines[] = 'autoindex off;'; + $lines[] = ''; + } + + if (!empty($opts['disable_server_signature'])) + { + $lines[] = '# Hide server version'; + $lines[] = 'server_tokens off;'; + $lines[] = ''; + } + + if (!empty($opts['block_sensitive_files'])) + { + $lines[] = '# Block sensitive files'; + $lines[] = 'location ~* (htaccess\.txt|web\.config\.txt|configuration\.php-dist|README\.txt|LICENSE\.txt)$ {'; + $lines[] = ' deny all;'; + $lines[] = '}'; + $lines[] = ''; + } + + if (!empty($opts['block_php_in_uploads'])) + { + $lines[] = '# Block PHP in upload directories'; + $lines[] = 'location ~* ^/(images|media|tmp|cache|logs)/.*\.php$ {'; + $lines[] = ' deny all;'; + $lines[] = '}'; + $lines[] = ''; + } + + // Headers + $hdrs = []; + + if (!empty($opts['prevent_clickjacking'])) + { + $hdrs[] = 'add_header X-Frame-Options "SAMEORIGIN" always;'; + } + + if (!empty($opts['prevent_mime_sniffing'])) + { + $hdrs[] = 'add_header X-Content-Type-Options "nosniff" always;'; + } + + if (!empty($opts['xss_protection'])) + { + $hdrs[] = 'add_header X-XSS-Protection "1; mode=block" always;'; + } + + $referrer = $opts['referrer_policy'] ?? ''; + + if (!empty($referrer) && $referrer !== 'off') + { + $hdrs[] = 'add_header Referrer-Policy "' . $referrer . '" always;'; + } + + if (!empty($opts['hsts_enabled'])) + { + $maxAge = (int) ($opts['hsts_max_age'] ?? 31536000); + $hsts = 'max-age=' . $maxAge; + + if (!empty($opts['hsts_subdomains'])) + { + $hsts .= '; includeSubDomains'; + } + + $hdrs[] = 'add_header Strict-Transport-Security "' . $hsts . '" always;'; + } + + if (!empty($hdrs)) + { + $lines[] = '# Security headers'; + $lines = array_merge($lines, $hdrs); + $lines[] = ''; + } + + if (!empty($opts['enable_gzip'])) + { + $lines[] = '# GZip compression'; + $lines[] = 'gzip on;'; + $lines[] = 'gzip_types text/plain text/css application/json application/javascript text/xml application/xml image/svg+xml;'; + $lines[] = 'gzip_min_length 256;'; + $lines[] = ''; + } + + if (!empty($opts['enable_expires'])) + { + $cssJs = (int) ($opts['expires_css_js'] ?? 2592000); + $images = (int) ($opts['expires_images'] ?? 31536000); + + $lines[] = '# Browser caching'; + $lines[] = 'location ~* \.(css|js)$ {'; + $lines[] = ' expires ' . round($cssJs / 86400) . 'd;'; + $lines[] = '}'; + $lines[] = 'location ~* \.(jpg|jpeg|png|gif|webp|svg|ico|woff2)$ {'; + $lines[] = ' expires ' . round($images / 86400) . 'd;'; + $lines[] = '}'; + $lines[] = ''; + } + + return implode("\n", $lines); + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Htaccess/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Htaccess/HtmlView.php new file mode 100644 index 00000000..1a7dc9de --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Htaccess/HtmlView.php @@ -0,0 +1,47 @@ +getModel(); + + $this->options = $model->getOptions(); + $this->preview = $model->generateHtaccess($this->options); + $this->nginxPreview = $model->generateNginx($this->options); + $this->currentHtaccess = $model->readCurrentHtaccess(); + + $this->addToolbar(); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } + + protected function addToolbar(): void + { + ToolbarHelper::title(Text::_('COM_MOKOWAAS_HTACCESS_TITLE'), 'file-code'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas'); + } +} diff --git a/src/packages/com_mokowaas/admin/tmpl/htaccess/default.php b/src/packages/com_mokowaas/admin/tmpl/htaccess/default.php new file mode 100644 index 00000000..79155233 --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/htaccess/default.php @@ -0,0 +1,306 @@ +options; +$preview = $this->preview; +$nginx = $this->nginxPreview; +$current = $this->currentHtaccess; +$token = Session::getFormToken(); +$saveUrl = Route::_('index.php?option=com_mokowaas&task=display.saveHtaccess&format=json'); +$genUrl = Route::_('index.php?option=com_mokowaas&task=display.generateHtaccess&format=json'); + +// Helper for toggle switch +$sw = function($name, $label, $desc = '') use ($opts) { + $checked = !empty($opts[$name]) ? 'checked' : ''; + echo '
'; + echo '
' . htmlspecialchars($label) . ''; + if ($desc) echo '
' . htmlspecialchars($desc) . ''; + echo '
'; + echo '
'; + echo ''; + echo '
'; +}; +?> + +
+ + +
+ +
+
+ +
+ +
+
Security
+
+ + + + + + + + + +
+ + +
+ + +
+
+
+ + +
+
+
+ > + +
+
+
+
+ + +
+ +
+ + +
+ +
+
+
+ +
+
Performance
+
+ + +
+
+
+ + +
+
+ + +
+
+ + +
+
+
+ +
+
+ +
+
SEO / Redirects
+
+
+ + +
+ + +
+
+ +
+
Custom Rules
+
+ +
+
+
+ + +
+
+
+ Preview + lines +
+
+ +
+
+ + +
+
+
+
+
+ + +
+
+
NginX Configuration Snippet
+
+ +
+
+ +
+
+
+ + +
+
+
Current .htaccess on Disk
+
+ +
+
+
+
+
+ + diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 842bae90..f44f13af 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -30,6 +30,7 @@ COM_MOKOWAAS_MENU_DASHBOARD COM_MOKOWAAS_MENU_EXTENSIONS + COM_MOKOWAAS_MENU_HTACCESS COM_MOKOWAAS_MENU_PLUGINS COM_MOKOWAAS_MENU_UPDATES COM_MOKOWAAS_MENU_CHECKIN From 12e9115a6a703c970392d72d92155b3404cd2938 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:05:56 +0000 Subject: [PATCH 008/220] chore(version): auto-bump 02.32.24 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 30f1a9af..2b441224 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.23 + 02.32.24 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index bf5f395e..f67edf97 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.23 +# VERSION: 02.32.24 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index f9a7677a..d1423865 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.23 + VERSION: 02.32.24 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 855c752b..322d99a4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 335fdad9..408f996c 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index f00a1a96..d260d56c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.23 + VERSION: 02.32.24 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 0f4de268..11cf2abc 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 1ef67735..a4ab24d1 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.23 +VERSION: 02.32.24 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index f487040d..b4a3f1d5 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.23) +# MokoWaaS Build Guide (VERSION: 02.32.24) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 0c41a28b..0f6c065c 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.23) +# MokoWaaS Configuration Guide (VERSION: 02.32.24) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 2ab661a2..faa23612 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.23) +# MokoWaaS Installation Guide (VERSION: 02.32.24) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 1d859faa..9a1511e6 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.23) +# MokoWaaS Operations Guide (VERSION: 02.32.24) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d976a1fd..392edeab 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.23) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.24) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 1e85ffd2..769b08f2 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.23) +# MokoWaaS Testing Guide (VERSION: 02.32.24) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 3021f709..2a97affa 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.23) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.24) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 0e0efed0..91685bcb 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.23) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.24) ## Introduction diff --git a/docs/index.md b/docs/index.md index 4b79c2eb..d0e03fe7 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.23 + VERSION: 02.32.24 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.23) +# MokoWaaS Documentation Index (VERSION: 02.32.24) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 59d92428..77df93dc 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.23 + VERSION: 02.32.24 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.23) +# MokoWaaS Plugin Overview (VERSION: 02.32.24) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 95f332cd..7a289ff0 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.23 +VERSION: 02.32.24 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index d23581ec..16f76411 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index b3187da2..10a6d3e2 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 7f281cfb..8fa523c5 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 36d8c0c1..d1730f37 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 733a52b2..ca4aff05 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 3c90e6db..3c3091d0 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index e560e8f4..6da008d7 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index a1dcc0d1..a8128917 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 21fc160a..e7664586 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 110a1876..56d567c0 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.23 + * VERSION: 02.32.24 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index d7ee2467..718e3dc0 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.23 + * VERSION: 02.32.24 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 5f0e52cf..f81988ff 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.23 + * VERSION: 02.32.24 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 443037b6..c2ec9d84 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index d059fcce..e51e181e 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 0657ee47..f16d4ed5 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.23 + * VERSION: 02.32.24 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index e1c038c8..6a514b82 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 8be67a2c..5f71a313 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 373fd212..3abf799a 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index a5383f16..f5a87e13 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 94266b79..b9c75811 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 - 02.32.23 + 02.32.24 + 02.32.24 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index b0f5bf94..191fded8 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 + 02.32.24 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 637c44c6..87b8a7ea 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 - 02.32.23 + 02.32.24 + 02.32.24 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 2fb307bd..5d27e2bf 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.23 - 02.32.23 + 02.32.24 + 02.32.24 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 132f8da4..4b3c931a 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.23 + * VERSION: 02.32.24 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 254b1536..f5beba97 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.23 + * VERSION: 02.32.24 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 68ec3b55..6ba63f03 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.23 + 02.32.24 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index d981bec7..22683fa1 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 8ce3452125a8ea03ae932f78c9bf8022a20bc16a Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:05:59 +0000 Subject: [PATCH 009/220] chore: update development channel 02.32.24 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 22683fa1..91b2b944 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.22-dev + 02.32.24-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.22-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.24-dev.zip - d96e622418b04747079620c36d95e2d054a8652eaf22ae756cad6177d27ebdcf + 789ea2778dd5b43440a596f9703d29efc93c70ac72c26a1348caff3583427b9a dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From af841ace1953d29287953757f8f2fe65b1aff3f4 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:09:01 -0500 Subject: [PATCH 010/220] fix: dashboard plugin cards - correct protected/enabled/configure-only states MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Task plugins (demo reset, content sync) show Enabled/Disabled badge instead of Protected — DB protected flag is for uninstall protection, not dashboard display - DevTools shows Enabled badge only (configure-only, no toggle) since features are controlled inside the plugin settings - Health Monitor marked as protected (cannot be disabled) - Added explicit metadata for task plugins instead of relying on guessPluginMeta Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/src/Model/DashboardModel.php | 94 ++++++++++++------- .../admin/tmpl/dashboard/default.php | 4 + 2 files changed, 62 insertions(+), 36 deletions(-) diff --git a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php index 8c9d3834..7879cbff 100644 --- a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php @@ -22,39 +22,60 @@ class DashboardModel extends BaseDatabaseModel */ private const PLUGIN_META = [ 'mokowaas' => [ - 'icon' => 'icon-shield-alt', - 'category' => 'core', - 'label' => 'Core — Branding & Identity', - 'description' => 'White-label branding, master user enforcement, emergency access, and plugin protection.', - 'protected' => true, + 'icon' => 'icon-shield-alt', + 'category' => 'core', + 'label' => 'Core — Branding & Identity', + 'description' => 'White-label branding, master user enforcement, emergency access, and plugin protection.', + 'protected' => true, + 'configure_only' => false, ], 'mokowaas_firewall' => [ - 'icon' => 'icon-lock', - 'category' => 'security', - 'label' => 'Firewall', - 'description' => 'Web Application Firewall — SQLi, XSS, RFI, DFI shields, IP blocklist, admin secret URL, file protection.', - 'protected' => false, + 'icon' => 'icon-lock', + 'category' => 'security', + 'label' => 'Firewall', + 'description' => 'Web Application Firewall — SQLi, XSS, RFI, DFI shields, IP blocklist, admin secret URL, file protection.', + 'protected' => false, + 'configure_only' => false, ], 'mokowaas_tenant' => [ - 'icon' => 'icon-users', - 'category' => 'security', - 'label' => 'Tenant Restrictions', - 'description' => 'Installer, sysinfo, config, and template access restrictions for non-master users.', - 'protected' => false, + 'icon' => 'icon-users', + 'category' => 'security', + 'label' => 'Tenant Restrictions', + 'description' => 'Installer, sysinfo, config, and template access restrictions for non-master users.', + 'protected' => false, + 'configure_only' => false, ], 'mokowaas_devtools' => [ - 'icon' => 'icon-wrench', - 'category' => 'tools', - 'label' => 'Developer Tools', - 'description' => 'Dev mode, hit counter reset, content version cleanup.', - 'protected' => false, + 'icon' => 'icon-wrench', + 'category' => 'tools', + 'label' => 'Developer Tools', + 'description' => 'Dev mode, hit counter reset, content version cleanup. Features are controlled inside the plugin settings.', + 'protected' => false, + 'configure_only' => true, ], 'mokowaas_monitor' => [ - 'icon' => 'icon-heartbeat', - 'category' => 'monitoring', - 'label' => 'Health Monitor', - 'description' => 'Site health checks, Grafana heartbeat integration, and diagnostics.', - 'protected' => false, + 'icon' => 'icon-heartbeat', + 'category' => 'monitoring', + 'label' => 'Health Monitor', + 'description' => 'Site health checks, Grafana heartbeat integration, and diagnostics.', + 'protected' => true, + 'configure_only' => false, + ], + 'mokowaasdemo' => [ + 'icon' => 'icon-undo', + 'category' => 'content', + 'label' => 'Demo Reset Task', + 'description' => 'Scheduled demo site reset with content snapshots.', + 'protected' => false, + 'configure_only' => true, + ], + 'mokowaassync' => [ + 'icon' => 'icon-sync', + 'category' => 'content', + 'label' => 'Content Sync Task', + 'description' => 'Scheduled content synchronisation to remote MokoWaaS sites.', + 'protected' => false, + 'configure_only' => true, ], ]; @@ -135,19 +156,20 @@ class DashboardModel extends BaseDatabaseModel $categoryInfo = self::CATEGORIES[$categoryKey] ?? self::CATEGORIES['tools']; $plugins[] = (object) [ - 'extension_id' => (int) $row->extension_id, - 'name' => $meta['label'] ?? $row->name, - 'element' => $row->element, - 'folder' => $row->folder, - 'type' => $row->type, - 'enabled' => (int) $row->enabled, - 'protected' => (int) $row->protected || ($meta['protected'] ?? false), - 'version' => $version, - 'icon' => $meta['icon'] ?? 'icon-puzzle-piece', - 'category' => $categoryKey, + 'extension_id' => (int) $row->extension_id, + 'name' => $meta['label'] ?? $row->name, + 'element' => $row->element, + 'folder' => $row->folder, + 'type' => $row->type, + 'enabled' => (int) $row->enabled, + 'protected' => (bool) ($meta['protected'] ?? false), + 'configure_only' => (bool) ($meta['configure_only'] ?? false), + 'version' => $version, + 'icon' => $meta['icon'] ?? 'icon-puzzle-piece', + 'category' => $categoryKey, 'categoryLabel' => $categoryInfo['label'], 'categoryBadge' => $categoryInfo['badge'], - 'description' => $meta['description'] ?? '', + 'description' => $meta['description'] ?? '', ]; } diff --git a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php index 6b879fae..4728a397 100644 --- a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php @@ -160,6 +160,10 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
protected): ?> + configure_only): ?> + + enabled ? Text::_('COM_MOKOWAAS_ENABLED') : Text::_('COM_MOKOWAAS_DISABLED'); ?> +
Date: Tue, 2 Jun 2026 19:09:22 +0000 Subject: [PATCH 011/220] chore(version): auto-bump 02.32.25 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 2b441224..1280d91c 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.24 + 02.32.25 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index f67edf97..8296e7f2 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.24 +# VERSION: 02.32.25 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index d1423865..bef9db19 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.24 + VERSION: 02.32.25 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 322d99a4..58afdbe0 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 408f996c..f79d96ff 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index d260d56c..9af465f9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.24 + VERSION: 02.32.25 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 11cf2abc..cc6c373f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index a4ab24d1..4a408c1d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.24 +VERSION: 02.32.25 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index b4a3f1d5..e00eb5be 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.24) +# MokoWaaS Build Guide (VERSION: 02.32.25) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 0f6c065c..062348c3 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.24) +# MokoWaaS Configuration Guide (VERSION: 02.32.25) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index faa23612..f5e6e63f 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.24) +# MokoWaaS Installation Guide (VERSION: 02.32.25) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 9a1511e6..60937c11 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.24) +# MokoWaaS Operations Guide (VERSION: 02.32.25) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 392edeab..d617af4d 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.24) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.25) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 769b08f2..23443699 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.24) +# MokoWaaS Testing Guide (VERSION: 02.32.25) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 2a97affa..e1aec739 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.24) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.25) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 91685bcb..3b8d4889 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.24) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.25) ## Introduction diff --git a/docs/index.md b/docs/index.md index d0e03fe7..95c50d77 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.24 + VERSION: 02.32.25 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.24) +# MokoWaaS Documentation Index (VERSION: 02.32.25) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 77df93dc..35d255af 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.24 + VERSION: 02.32.25 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.24) +# MokoWaaS Plugin Overview (VERSION: 02.32.25) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 7a289ff0..c3eb5c8f 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.24 +VERSION: 02.32.25 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 16f76411..40991fc6 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 10a6d3e2..5328d25a 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 8fa523c5..3460d456 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index d1730f37..bbc9cece 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index ca4aff05..4eb943f5 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 3c3091d0..dfac23c9 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 6da008d7..21b97a0f 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index a8128917..be66aa40 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index e7664586..7d5af01a 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 56d567c0..05f0d7fa 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.24 + * VERSION: 02.32.25 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 718e3dc0..7b965b90 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.24 + * VERSION: 02.32.25 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index f81988ff..24384062 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.24 + * VERSION: 02.32.25 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index c2ec9d84..4ba41047 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index e51e181e..4666742a 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index f16d4ed5..174704a9 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.24 + * VERSION: 02.32.25 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 6a514b82..01a7d3f3 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 5f71a313..5f3342f0 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 3abf799a..6ec2b210 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index f5a87e13..e9d03f25 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index b9c75811..962c826b 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 - 02.32.24 + 02.32.25 + 02.32.25 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 191fded8..5109d4d1 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 + 02.32.25 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 87b8a7ea..fa657a97 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 - 02.32.24 + 02.32.25 + 02.32.25 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 5d27e2bf..abfcefda 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.24 - 02.32.24 + 02.32.25 + 02.32.25 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 4b3c931a..963c4233 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.24 + * VERSION: 02.32.25 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index f5beba97..23cd9adf 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.24 + * VERSION: 02.32.25 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 6ba63f03..e93199e9 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.24 + 02.32.25 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 91b2b944..0dabf47c 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 5a1a2f98b03281402a5d73595748004a7ce38416 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:09:24 +0000 Subject: [PATCH 012/220] chore: update development channel 02.32.25 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 0dabf47c..4a2a2889 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.24-dev + 02.32.25-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.24-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.25-dev.zip - 789ea2778dd5b43440a596f9703d29efc93c70ac72c26a1348caff3583427b9a + 1fb2a04c8367972a9677d4760e42a6f10767970e8d58dfb1dfd3fd01aceebc3d dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 267beea8f94b2b0c2231dc21477efc8ba781906e Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:13:02 -0500 Subject: [PATCH 013/220] chore: update MokoOnyx submodule to 02.17.00 stable Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/tpl_mokoonyx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/packages/tpl_mokoonyx b/src/packages/tpl_mokoonyx index 16a7090f..f3897495 160000 --- a/src/packages/tpl_mokoonyx +++ b/src/packages/tpl_mokoonyx @@ -1 +1 @@ -Subproject commit 16a7090f29e0d8622a8bc6a72a7858ebaf6fac64 +Subproject commit f3897495ad93eb9ea8be53bfe2e643c22fd09dec From d563e2eac87ceb7914e62c8caa8ac5ea2fd3e38a Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:14:07 -0500 Subject: [PATCH 014/220] refactor: remove Health Monitor plugin - heartbeat built into core (#115) The health monitor/Grafana heartbeat is mandatory infrastructure that must always be active. The core system plugin (plg_system_mokowaas) already has handleGrafanaProvisioning() and sendHeartbeat(), making the separate monitor plugin redundant. - Removed plg_system_mokowaas_monitor from package manifest - Removed from script.php enable/protect lists - Removed from cascade enable/disable logic - Removed from dashboard plugin metadata - Excluded from dashboard plugin discovery query - Disabled on dev server (can be uninstalled manually) Health monitoring is now entirely handled by the core plugin which is protected and cannot be disabled. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../com_mokowaas/admin/src/Model/DashboardModel.php | 11 ++--------- .../plg_system_mokowaas/Extension/MokoWaaS.php | 1 - src/pkg_mokowaas.xml | 1 - src/script.php | 2 -- 4 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php index 7879cbff..6e122eaf 100644 --- a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php @@ -53,14 +53,6 @@ class DashboardModel extends BaseDatabaseModel 'protected' => false, 'configure_only' => true, ], - 'mokowaas_monitor' => [ - 'icon' => 'icon-heartbeat', - 'category' => 'monitoring', - 'label' => 'Health Monitor', - 'description' => 'Site health checks, Grafana heartbeat integration, and diagnostics.', - 'protected' => true, - 'configure_only' => false, - ], 'mokowaasdemo' => [ 'icon' => 'icon-undo', 'category' => 'content', @@ -118,7 +110,8 @@ class DashboardModel extends BaseDatabaseModel '(' . $db->quoteName('type') . ' = ' . $db->quote('plugin') . ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('system') . ' AND (' . $db->quoteName('element') . ' = ' . $db->quote('mokowaas') - . ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokowaas\_%') . '))' + . ' OR ' . $db->quoteName('element') . ' LIKE ' . $db->quote('mokowaas\_%') . ')' + . ' AND ' . $db->quoteName('element') . ' != ' . $db->quote('mokowaas_monitor') . ')' // Webservices plugins . ' OR (' . $db->quoteName('type') . ' = ' . $db->quote('plugin') . ' AND ' . $db->quoteName('folder') . ' = ' . $db->quote('webservices') diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 8fa523c5..a9a213e8 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -1509,7 +1509,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $db->quote('mokowaas_firewall'), $db->quote('mokowaas_tenant'), $db->quote('mokowaas_devtools'), - $db->quote('mokowaas_monitor'), $db->quote('mod_mokowaas_cpanel'), ]; diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 6ba63f03..5ffbdfc1 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -17,7 +17,6 @@ plg_system_mokowaas_firewall.zip plg_system_mokowaas_tenant.zip plg_system_mokowaas_devtools.zip - plg_system_mokowaas_monitor.zip com_mokowaas.zip mod_mokowaas_cpanel.zip plg_webservices_mokowaas.zip diff --git a/src/script.php b/src/script.php index eb04804c..94e90b32 100644 --- a/src/script.php +++ b/src/script.php @@ -41,7 +41,6 @@ class Pkg_MokowaasInstallerScript $this->enablePlugin('system', 'mokowaas_firewall'); $this->enablePlugin('system', 'mokowaas_tenant'); $this->enablePlugin('system', 'mokowaas_devtools'); - $this->enablePlugin('system', 'mokowaas_monitor'); $this->enablePlugin('webservices', 'mokowaas'); $this->enablePlugin('task', 'mokowaasdemo'); $this->enablePlugin('task', 'mokowaassync'); @@ -211,7 +210,6 @@ class Pkg_MokowaasInstallerScript $db->quote('mokowaas_firewall'), $db->quote('mokowaas_tenant'), $db->quote('mokowaas_devtools'), - $db->quote('mokowaas_monitor'), $db->quote('com_mokowaas'), $db->quote('mod_mokowaas_cpanel'), $db->quote('mokowaasdemo'), From dac5c6c05215f44614a7d387da417e01381a0c69 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:14:28 +0000 Subject: [PATCH 015/220] chore(version): auto-bump 02.32.26 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 1280d91c..89625564 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.25 + 02.32.26 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 8296e7f2..f0ade88b 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.25 +# VERSION: 02.32.26 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index bef9db19..84f97ddf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.25 + VERSION: 02.32.26 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 58afdbe0..3eb9ee66 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index f79d96ff..bdb2abc3 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 9af465f9..37d199e2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.25 + VERSION: 02.32.26 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index cc6c373f..5bf07f48 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 4a408c1d..a6be5405 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.25 +VERSION: 02.32.26 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index e00eb5be..c635d662 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.25) +# MokoWaaS Build Guide (VERSION: 02.32.26) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 062348c3..9030b319 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.25) +# MokoWaaS Configuration Guide (VERSION: 02.32.26) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index f5e6e63f..0d57c326 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.25) +# MokoWaaS Installation Guide (VERSION: 02.32.26) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 60937c11..8847c712 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.25) +# MokoWaaS Operations Guide (VERSION: 02.32.26) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d617af4d..694497cf 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.25) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.26) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 23443699..34e87c11 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.25) +# MokoWaaS Testing Guide (VERSION: 02.32.26) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index e1aec739..ca103505 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.25) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.26) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 3b8d4889..0b485862 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.25) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.26) ## Introduction diff --git a/docs/index.md b/docs/index.md index 95c50d77..9013b93b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.25 + VERSION: 02.32.26 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.25) +# MokoWaaS Documentation Index (VERSION: 02.32.26) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 35d255af..d70a0e6d 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.25 + VERSION: 02.32.26 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.25) +# MokoWaaS Plugin Overview (VERSION: 02.32.26) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index c3eb5c8f..988ffa5a 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.25 +VERSION: 02.32.26 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 40991fc6..a726760d 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 5328d25a..4721d067 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 4977fdff..32265849 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index bbc9cece..97200057 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 4eb943f5..8bc797bb 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index dfac23c9..fc5fb35a 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 21b97a0f..b6294b92 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index be66aa40..44bc855a 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 7d5af01a..ae171705 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 05f0d7fa..2a127359 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.25 + * VERSION: 02.32.26 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 7b965b90..83041115 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.25 + * VERSION: 02.32.26 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 24384062..0fe3adad 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.25 + * VERSION: 02.32.26 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 4ba41047..1d7ac030 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 4666742a..2af18d35 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 174704a9..91b0510c 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.25 + * VERSION: 02.32.26 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 01a7d3f3..de4e63a5 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 5f3342f0..dc7b9f73 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 6ec2b210..cff8d343 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index e9d03f25..3c96e30d 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 962c826b..a6babf33 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 - 02.32.25 + 02.32.26 + 02.32.26 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 5109d4d1..6ae2913d 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 + 02.32.26 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index fa657a97..69b4b620 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 - 02.32.25 + 02.32.26 + 02.32.26 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index abfcefda..c1785db0 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.25 - 02.32.25 + 02.32.26 + 02.32.26 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 963c4233..14d07b40 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.25 + * VERSION: 02.32.26 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 23cd9adf..cda5f885 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.25 + * VERSION: 02.32.26 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 39e3438b..4758bcf0 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.25 + 02.32.26 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 4a2a2889..1d667946 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 79c3cfc1f00c62f1f431c79cb6b563a7afa0d705 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:14:30 +0000 Subject: [PATCH 016/220] chore: update development channel 02.32.26 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 1d667946..819fb214 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.25-dev + 02.32.26-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.25-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.26-dev.zip - 1fb2a04c8367972a9677d4760e42a6f10767970e8d58dfb1dfd3fd01aceebc3d + de5fe3c9660f551bfa83dda522a9a54df67f9683a7bd44db30125fd14a1ed69a dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From a78178b5dd948329aa4566c4edb195bbb06189d3 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:17:21 -0500 Subject: [PATCH 017/220] feat: auto-remove retired monitor plugin on package update Added removeRetiredExtensions() to package postflight script. On every install/update, it checks for retired extensions and removes them (DB record + files). Currently retires: - plg_system_mokowaas_monitor (merged into core in 02.32.00) Future retired extensions can be added to the $retired array. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/script.php | 81 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 80 insertions(+), 1 deletion(-) diff --git a/src/script.php b/src/script.php index 94e90b32..481deb61 100644 --- a/src/script.php +++ b/src/script.php @@ -34,8 +34,9 @@ class Pkg_MokowaasInstallerScript */ public function postflight($type, $parent) { - // Remove legacy extensions from before the package rewrite + // Remove legacy and retired extensions $this->cleanupLegacyExtensions(); + $this->removeRetiredExtensions(); $this->enablePlugin('system', 'mokowaas'); $this->enablePlugin('system', 'mokowaas_firewall'); @@ -125,6 +126,84 @@ class Pkg_MokowaasInstallerScript } } + /** + * Remove extensions that have been retired and merged into core. + * + * plg_system_mokowaas_monitor was merged into the core plugin in 02.32.00. + * Health monitoring is now built into plg_system_mokowaas directly. + * + * @return void + * + * @since 02.32.00 + */ + private function removeRetiredExtensions(): void + { + $retired = [ + ['type' => 'plugin', 'folder' => 'system', 'element' => 'mokowaas_monitor'], + ]; + + try + { + $db = Factory::getDbo(); + + foreach ($retired as $ext) + { + // Check if installed + $query = $db->getQuery(true) + ->select($db->quoteName('extension_id')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('type') . ' = ' . $db->quote($ext['type'])) + ->where($db->quoteName('folder') . ' = ' . $db->quote($ext['folder'])) + ->where($db->quoteName('element') . ' = ' . $db->quote($ext['element'])); + $db->setQuery($query); + $extId = (int) $db->loadResult(); + + if (!$extId) + { + continue; + } + + // Unprotect so Joomla allows removal + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('protected') . ' = 0') + ->where($db->quoteName('extension_id') . ' = ' . $extId) + )->execute(); + + // Remove extension record + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__extensions')) + ->where($db->quoteName('extension_id') . ' = ' . $extId) + )->execute(); + + // Remove files + $dir = JPATH_PLUGINS . '/' . $ext['folder'] . '/' . $ext['element']; + + if (is_dir($dir)) + { + $this->rmdirRecursive($dir); + } + + Factory::getApplication()->enqueueMessage( + sprintf('Removed retired extension: %s/%s', $ext['folder'], $ext['element']), + 'message' + ); + + Log::add( + sprintf('Removed retired extension %s/%s (ID %d)', $ext['folder'], $ext['element'], $extId), + Log::INFO, + 'mokowaas' + ); + } + } + catch (\Throwable $e) + { + Log::add('Retired extension cleanup error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + /** * Recursively remove a directory. * From 1e6a255fab3e2e0e9b398d9f1edb98c386628012 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:21:03 -0500 Subject: [PATCH 018/220] fix: duplicate Core card on dashboard - webservices plugin matching core metadata [skip ci] The webservices plugin (element=mokowaas, folder=webservices) was matching the PLUGIN_META entry for the core system plugin since the lookup key was just the element name. Fixed by only matching system and task plugins against PLUGIN_META; webservices/other folders use folder_element as the key and fall through to guessPluginMeta. Also includes auto-remove retired monitor plugin on package update. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../com_mokowaas/admin/src/Model/DashboardModel.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php index 6e122eaf..b0706f4f 100644 --- a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php @@ -134,8 +134,10 @@ class DashboardModel extends BaseDatabaseModel $manifest = json_decode($row->manifest_cache ?? '{}'); $version = $manifest->version ?? ''; - // Build a lookup key: system plugins use element, others use folder_element - $metaKey = $row->element; + // Only system plugins and task plugins match PLUGIN_META by element + $metaKey = ($row->folder === 'system' || $row->folder === 'task') + ? $row->element + : $row->folder . '_' . $row->element; $meta = self::PLUGIN_META[$metaKey] ?? null; From 1ad1f1c010fef73b8c2e3b60aac1b6a7fc8f15a6 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:31:42 -0500 Subject: [PATCH 019/220] refactor: remove duplicate features from core plugin Removed from onAfterInitialise: - enforceHttps (now in firewall plugin) - enforceDevMode (now in devtools plugin) - enforceAdminSessionTimeout (now in firewall plugin) - enforceUploadRestrictions (now in firewall plugin) Removed from onAfterRoute: - warnMissingLicenseKey (deferred - licensing not ready) - enforceAdminRestrictions (now in tenant plugin) Removed event handlers: - onPreprocessMenuItems (now in tenant plugin) - onUserBeforeSave (now in firewall plugin) Removed from onExtensionAfterSave: - resetAllHits / deleteAllVersions (now in devtools plugin) Removed param fieldsets from manifest: - tenant_restrictions (now in tenant plugin) - dev_mode, reset_hits, delete_versions (now in devtools plugin) - force_https, session_timeout, trusted_ips, password_*, upload_* (now in firewall plugin) Core plugin now only handles: branding, master user, emergency access, site aliases, Atum branding, language overrides, health API, Grafana heartbeat, demo banner, plugin protection, and content sync. Settings migration handled by migrateFeatureParams() in script.php. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Extension/MokoWaaS.php | 158 +----------------- src/packages/plg_system_mokowaas/mokowaas.xml | 136 +-------------- 2 files changed, 12 insertions(+), 282 deletions(-) diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 32265849..5737b757 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -189,12 +189,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface */ public function onAfterInitialise() { - // Security: HTTPS redirect (runs for all clients) - $this->enforceHttps(); - - // Site alias handling: offline page and backend redirect. - // Must run in onAfterInitialise (not onAfterRoute) so that - // Joomla's offline check in doExecute() sees the updated config. + // Site alias handling $this->handleSiteAlias(); // MokoWaaS API endpoints (run before routing) @@ -205,18 +200,15 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $this->handleMokoApi($mokoAction); } - // Dev mode: disable caching - $this->enforceDevMode(); - - // Admin-only WaaS controls + // Admin-only core controls (branding, emergency access, master user) + // NOTE: enforceHttps, enforceDevMode, enforceAdminSessionTimeout, + // enforceUploadRestrictions are now in feature plugins if ($this->app->isClient('administrator')) { $this->handleEmergencyAccess(); $this->enforceMasterUser(); $this->enforceLoginSupportUrls(); $this->enforceAtumBranding(); - $this->enforceAdminSessionTimeout(); - $this->enforceUploadRestrictions(); } $this->loadLanguageOverrides(); @@ -883,41 +875,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface // Grafana auto-provisioning $this->handleGrafanaProvisioning($params, $app); - if ((int) $params->get('reset_hits', 0) === 1) - { - $count = $this->resetAllHits(); - $params->set('reset_hits', '0'); - $changed = true; - - $app->enqueueMessage( - sprintf('Reset hit counters on %d articles.', $count), - 'message' - ); - - Log::add( - sprintf('All article hits reset (%d rows) by MokoWaaS', $count), - Log::WARNING, - 'mokowaas' - ); - } - - if ((int) $params->get('delete_versions', 0) === 1) - { - $count = $this->deleteAllVersions(); - $params->set('delete_versions', '0'); - $changed = true; - - $app->enqueueMessage( - sprintf('Deleted %d version history records.', $count), - 'message' - ); - - Log::add( - sprintf('All content versions purged (%d rows) by MokoWaaS', $count), - Log::WARNING, - 'mokowaas' - ); - } + // NOTE: reset_hits and delete_versions now handled by devtools plugin // Content Sync: Push Now if ((int) $params->get('sync_push_now', 0) === 1) @@ -1036,8 +994,8 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface return; } - $this->warnMissingLicenseKey(); - $this->enforceAdminRestrictions(); + // NOTE: warnMissingLicenseKey and enforceAdminRestrictions + // are now handled by feature plugins (deferred / tenant) $this->protectPlugin(); } @@ -1552,106 +1510,8 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface } } - /** - * Filter admin menu items for non-master users. - * - * @param string $context Menu context - * @param array &$items Menu items (by reference) - * @param mixed $params Module params - * @param mixed $enabled Whether module is enabled - * - * @return void - * - * @since 02.01.08 - */ - public function onPreprocessMenuItems($context, &$items, $params, $enabled) - { - if (!$this->app->isClient('administrator')) - { - return; - } - - if ($this->isMasterUser()) - { - return; - } - - $hidden = $this->getHiddenMenuComponents(); - - if (empty($hidden)) - { - return; - } - - foreach ($items as $key => $item) - { - foreach ($hidden as $component) - { - if (isset($item->link) - && strpos($item->link, 'option=' . $component) !== false) - { - unset($items[$key]); - break; - } - } - } - } - - /** - * Enforce password policy before user save. - * - * @param array $oldUser Existing user data - * @param boolean $isNew Whether this is a new user - * @param array $newUser New user data being saved - * - * @return boolean True to allow save - * - * @since 02.01.08 - */ - public function onUserBeforeSave($oldUser, $isNew, $newUser) - { - if (empty($newUser['password_clear'])) - { - return true; - } - - $password = $newUser['password_clear']; - $errors = []; - - $minLen = (int) $this->params->get('password_min_length', 12); - - if (strlen($password) < $minLen) - { - $errors[] = sprintf( - 'Password must be at least %d characters.', $minLen - ); - } - - if ($this->params->get('password_require_uppercase', 1) - && !preg_match('/[A-Z]/', $password)) - { - $errors[] = 'Password must contain an uppercase letter.'; - } - - if ($this->params->get('password_require_number', 1) - && !preg_match('/\d/', $password)) - { - $errors[] = 'Password must contain a number.'; - } - - if ($this->params->get('password_require_special', 1) - && !preg_match('/[^A-Za-z0-9]/', $password)) - { - $errors[] = 'Password must contain a special character.'; - } - - if (!empty($errors)) - { - throw new \RuntimeException(implode(' ', $errors)); - } - - return true; - } + // onPreprocessMenuItems — REMOVED, now in plg_system_mokowaas_tenant + // onUserBeforeSave — REMOVED, now in plg_system_mokowaas_firewall // ------------------------------------------------------------------ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 1d7ac030..b7ec4b72 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -76,7 +76,9 @@ -
+
- - - - - - - - - - - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - -
From cf39c169d2061cf6ce7c83d377c84f2a3faae4e9 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:31:57 +0000 Subject: [PATCH 020/220] chore(version): auto-bump 02.32.27 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 89625564..ef712e3d 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.26 + 02.32.27 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index f0ade88b..dceb1837 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.26 +# VERSION: 02.32.27 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 84f97ddf..04ecefac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.26 + VERSION: 02.32.27 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3eb9ee66..6a1a5eab 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index bdb2abc3..73d1a486 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 37d199e2..6c7ad336 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.26 + VERSION: 02.32.27 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 5bf07f48..11eadeb4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index a6be5405..b1667089 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.26 +VERSION: 02.32.27 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index c635d662..8d3c9ddc 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.26) +# MokoWaaS Build Guide (VERSION: 02.32.27) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 9030b319..2fec27ca 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.26) +# MokoWaaS Configuration Guide (VERSION: 02.32.27) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 0d57c326..5a66883d 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.26) +# MokoWaaS Installation Guide (VERSION: 02.32.27) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 8847c712..031e15c0 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.26) +# MokoWaaS Operations Guide (VERSION: 02.32.27) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 694497cf..8207fab3 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.26) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.27) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 34e87c11..b8562421 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.26) +# MokoWaaS Testing Guide (VERSION: 02.32.27) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index ca103505..9f5eb474 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.26) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.27) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 0b485862..4959f77f 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.26) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.27) ## Introduction diff --git a/docs/index.md b/docs/index.md index 9013b93b..0307ee8c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.26 + VERSION: 02.32.27 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.26) +# MokoWaaS Documentation Index (VERSION: 02.32.27) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index d70a0e6d..4887b3b4 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.26 + VERSION: 02.32.27 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.26) +# MokoWaaS Plugin Overview (VERSION: 02.32.27) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 988ffa5a..c7f5982d 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.26 +VERSION: 02.32.27 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index a726760d..fd260563 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 4721d067..a38d649b 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 5737b757..12a24185 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 97200057..cace4024 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 8bc797bb..35e0f22e 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index fc5fb35a..5dd96bf7 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index b6294b92..8d7ea373 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 44bc855a..ca48c877 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index ae171705..65127456 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 2a127359..03b0606f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.26 + * VERSION: 02.32.27 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 83041115..56244a6f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.26 + * VERSION: 02.32.27 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 0fe3adad..bcd87cc5 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.26 + * VERSION: 02.32.27 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index b7ec4b72..b8bd35df 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 2af18d35..c076faf2 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 91b0510c..5c467471 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.26 + * VERSION: 02.32.27 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index de4e63a5..193bf41d 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index dc7b9f73..986d855f 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index cff8d343..c505fb88 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 3c96e30d..6fc57cac 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index a6babf33..9ae01ec7 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 - 02.32.26 + 02.32.27 + 02.32.27 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 6ae2913d..ab9cdb7b 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 + 02.32.27 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 69b4b620..f7996fce 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 - 02.32.26 + 02.32.27 + 02.32.27 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index c1785db0..84273399 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.26 - 02.32.26 + 02.32.27 + 02.32.27 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 14d07b40..fcc3bb8d 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.26 + * VERSION: 02.32.27 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index cda5f885..a09e4f58 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.26 + * VERSION: 02.32.27 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 4758bcf0..5e7f2cb5 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.26 + 02.32.27 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 819fb214..fb45e2a6 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From a89d5166239d1e6e4cb06ec32129954b7edc34c8 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:31:59 +0000 Subject: [PATCH 021/220] chore: update development channel 02.32.27 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index fb45e2a6..c5348bc5 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.26-dev + 02.32.27-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.26-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.27-dev.zip - de5fe3c9660f551bfa83dda522a9a54df67f9683a7bd44db30125fd14a1ed69a + bd6356adc7d195a59437462d89bf99bf7834e3802ef933bd0862169867eea0e1 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 9a375740b91d34834733a55abda5e7dfad36d578 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:33:57 -0500 Subject: [PATCH 022/220] refactor: remove 12 dead method bodies from core plugin (-607 lines) Removed: resetAllHits, deleteAllVersions, warnMissingLicenseKey, enforceDevMode, onDevModeDisabled, enforceHttps, enforceAdminSessionTimeout, ipIsTrusted, enforceUploadRestrictions, enforceAdminRestrictions, blockAccess, getHiddenMenuComponents These methods were already unreachable after the call sites were removed in the previous commit. The functionality lives in the firewall, tenant, and devtools feature plugins. Core plugin: 5366 -> 4759 lines Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Extension/MokoWaaS.php | 607 ------------------ 1 file changed, 607 deletions(-) diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 5737b757..f6c64133 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -807,7 +807,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface return $strings; } - /** * Event triggered after an extension's config is saved. * @@ -935,48 +934,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface } } - /** - * Reset all article hit counters to zero. - * - * @return int Number of rows affected - * - * @since 02.01.08 - */ - protected function resetAllHits() - { - $db = Factory::getDbo(); - - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__content')) - ->set($db->quoteName('hits') . ' = 0') - ->where($db->quoteName('hits') . ' > 0') - ); - $db->execute(); - - return $db->getAffectedRows(); - } - - /** - * Delete all content version history records. - * - * @return int Number of rows deleted - * - * @since 02.01.08 - */ - protected function deleteAllVersions() - { - $db = Factory::getDbo(); - - $db->setQuery( - $db->getQuery(true) - ->delete($db->quoteName('#__history')) - ); - $db->execute(); - - return $db->getAffectedRows(); - } - /** * Event triggered after the route has been determined. * @@ -1513,7 +1470,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface // onPreprocessMenuItems — REMOVED, now in plg_system_mokowaas_tenant // onUserBeforeSave — REMOVED, now in plg_system_mokowaas_firewall - // ------------------------------------------------------------------ // Diagnostics / Health Endpoint (called from onAfterInitialise) // ------------------------------------------------------------------ @@ -4279,130 +4235,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface // License key check (called from onAfterRoute) // ------------------------------------------------------------------ - /** - * Show a persistent admin warning if no license key is set on the - * MokoWaaS update site. - * - * Checks the extra_query column in #__update_sites for a dlid value. - * Also validates the key against MokoGitea on a heartbeat interval - * (once per day) and warns if the key is invalid or expired. - * - * @return void - * - * @since 02.31.00 - */ - protected function warnMissingLicenseKey(): void - { - // Only show to master users - if (!$this->isMasterUser()) - { - return; - } - - // Only warn once per session - $session = Factory::getSession(); - - if ($session->get('mokowaas.license_warned', false)) - { - return; - } - - $session->set('mokowaas.license_warned', true); - - try - { - $db = Factory::getDbo(); - - $query = $db->getQuery(true) - ->select($db->quoteName('extra_query')) - ->from($db->quoteName('#__update_sites')) - ->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoWaaS%') - . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')') - ->setLimit(1); - $db->setQuery($query); - $extraQuery = (string) $db->loadResult(); - - if (empty($extraQuery) || strpos($extraQuery, 'dlid=') === false) - { - $this->app->enqueueMessage( - 'Moko Consulting License Key Required — ' - . 'No download key is configured. Updates will not be available until a valid license key is entered. ' - . 'Go to System → Update Sites ' - . 'and enter your license key in the Download Key field for the MokoWaaS update site.', - 'warning' - ); - - return; - } - - // Extract the key value from extra_query - parse_str($extraQuery, $parsed); - $licenseKey = $parsed['dlid'] ?? ''; - - if (empty($licenseKey)) - { - return; - } - - // Heartbeat validation — check once per day - $session = Factory::getSession(); - $lastCheck = (int) $session->get('mokowaas.license_check', 0); - $now = time(); - - if (($now - $lastCheck) < 86400) - { - // Show cached warning if key was invalid last check - if ($session->get('mokowaas.license_invalid', false)) - { - $this->app->enqueueMessage( - 'Moko Consulting License Key Invalid — ' - . 'Your license key could not be validated. Please verify your key in ' - . 'System → Update Sites.', - 'error' - ); - } - - return; - } - - // Validate against MokoGitea - $session->set('mokowaas.license_check', $now); - - $validateUrl = 'https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/updates.xml' - . '?dlid=' . urlencode($licenseKey) - . '&domain=' . urlencode(Uri::root()); - - $ch = curl_init($validateUrl); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_TIMEOUT, 10); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - $response = curl_exec($ch); - $httpCode = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE); - curl_close($ch); - - // Empty or non-200 means invalid key - $isValid = ($httpCode === 200 && $response && strpos($response, '') !== false); - - $session->set('mokowaas.license_invalid', !$isValid); - - if (!$isValid) - { - $this->app->enqueueMessage( - 'Moko Consulting License Key Invalid — ' - . 'Your license key could not be validated. Updates will not be available. ' - . 'Please verify your key in ' - . 'System → Update Sites.', - 'error' - ); - } - } - catch (\Throwable $e) - { - // Silent — license check is non-critical - } - } - // ------------------------------------------------------------------ /** @@ -4538,110 +4370,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface * * @since 02.01.08 */ - /** - * Enforce development mode settings. - * - * When dev mode is ON: - * - Disable Joomla caching - * - Enable Joomla debug mode (Global Config) - * - Enable MokoOnyx template debug - * - Disable article hit recording - * - * When dev mode is OFF (and was previously on): - * - Reset all content version history - * - Reset article published dates to now - * - * @return void - * - * @since 02.01.15 - */ - protected function enforceDevMode() - { - if (!$this->params->get('dev_mode', 0)) - { - return; - } - - // Disable caching - $config = Factory::getConfig(); - $config->set('caching', 0); - - // Enable Joomla debug - $config->set('debug', 1); - - // Enable MokoOnyx template debug - $this->setTemplateParam('mokoonyx', 'debug', 1); - - // Show offline page on primary domain only — site aliases - // and dev.* subdomains bypass offline mode for development - $currentHost = $_SERVER['HTTP_HOST'] ?? ''; - $primaryDomain = $this->params->get('primary_domain', ''); - - if (!empty($primaryDomain) && $currentHost === $primaryDomain) - { - $config->set('offline', 1); - } - - // Suppress hit recording - try - { - $db = Factory::getDbo(); - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__content')) - ->set($db->quoteName('hits') . ' = 0') - ->where($db->quoteName('hits') . ' > 0') - )->execute(); - } - catch (\Throwable $e) - { - // Silent - } - } - - /** - * Actions to run when dev mode is turned off. - * - * Resets content versions and hits, disables debug. - * - * @return void - * - * @since 02.31.00 - */ - protected function onDevModeDisabled(): void - { - try - { - $db = Factory::getDbo(); - - // Delete all content version history - $db->setQuery( - $db->getQuery(true)->delete($db->quoteName('#__history')) - )->execute(); - - // Reset hits - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__content')) - ->set($db->quoteName('hits') . ' = 0') - )->execute(); - - // Disable debug - $this->setTemplateParam('mokoonyx', 'debug', 0); - - // Take site back online - Factory::getConfig()->set('offline', 0); - - $this->app->enqueueMessage( - 'Development mode disabled — versions cleared, hits reset, debug off, site online.', - 'message' - ); - } - catch (\Throwable $e) - { - Log::add('Dev mode cleanup failed: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); - } - } /** * Set a parameter on a template style. @@ -4689,194 +4417,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface } } - protected function enforceHttps() - { - if (!$this->params->get('force_https', 0)) - { - return; - } - - if ($this->app->isClient('cli')) - { - return; - } - - $isHttps = (!empty($_SERVER['HTTPS']) - && $_SERVER['HTTPS'] !== 'off') - || ($_SERVER['HTTP_X_FORWARDED_PROTO'] ?? '') === 'https'; - - if (!$isHttps) - { - $this->app->redirect( - 'https://' . $_SERVER['HTTP_HOST'] - . $_SERVER['REQUEST_URI'], 301 - ); - } - } - - /** - * Enforce admin session idle timeout. - * - * @return void - * - * @since 02.01.08 - */ - protected function enforceAdminSessionTimeout() - { - $timeout = (int) $this->params->get('admin_session_timeout', 0); - - if ($timeout <= 0) - { - return; - } - - // Don't timeout the master user - if ($this->isMasterUser()) - { - return; - } - - // Trusted IPs — session lifetime already extended in boot() - if ($this->ipIsTrusted()) - { - return; - } - - $session = Factory::getSession(); - $lastHit = $session->get('mokowaas.last_activity', 0); - $now = time(); - - if ($lastHit > 0 && ($now - $lastHit) > ($timeout * 60)) - { - $this->app->logout(); - $this->app->redirect( - Route::_('index.php', false) - ); - - return; - } - - $session->set('mokowaas.last_activity', $now); - } - - /** - * Check whether the current request IP matches any trusted IP entry. - * - * Supports exact IPs, CIDR notation (e.g. 10.0.0.0/8), and - * wildcard patterns (e.g. 192.168.1.*). - * - * @return bool True if the current IP is in the trusted list. - * - * @since 02.11.00 - */ - protected function ipIsTrusted(): bool - { - $entries = $this->params->get('trusted_ips', ''); - - if (empty($entries)) - { - return false; - } - - // Subform stores as JSON string or array - if (\is_string($entries)) - { - $entries = json_decode($entries, true); - } - - if (!\is_array($entries)) - { - return false; - } - - $ip = $this->app - ? $this->app->input->server->getString('REMOTE_ADDR', '') - : ($_SERVER['REMOTE_ADDR'] ?? ''); - $ipLong = ip2long($ip); - - if ($ipLong === false) - { - return false; - } - - foreach ($entries as $entry) - { - if (empty($entry['enabled']) || empty($entry['ip'])) - { - continue; - } - - $range = trim($entry['ip']); - - // Wildcard: 192.168.1.* - if (str_contains($range, '*')) - { - $pattern = '/^' . str_replace(['.', '*'], ['\\.', '\\d+'], $range) . '$/'; - - if (preg_match($pattern, $ip)) - { - return true; - } - - continue; - } - - // CIDR: 10.0.0.0/8 - if (str_contains($range, '/')) - { - [$subnet, $bits] = explode('/', $range, 2); - $subnetLong = ip2long($subnet); - $mask = -1 << (32 - (int) $bits); - - if ($subnetLong !== false && ($ipLong & $mask) === ($subnetLong & $mask)) - { - return true; - } - - continue; - } - - // Exact match - if ($ip === $range) - { - return true; - } - } - - return false; - } - - - /** - * Override Joomla upload restrictions at runtime. - * - * @return void - * - * @since 02.01.08 - */ - protected function enforceUploadRestrictions() - { - $types = $this->params->get('upload_allowed_types', ''); - $maxMb = (int) $this->params->get('upload_max_size_mb', 0); - - if (empty($types) && $maxMb <= 0) - { - return; - } - - $config = $this->app->getConfig(); - - if (!empty($types)) - { - $config->set('upload_extensions', $types); - } - - if ($maxMb > 0) - { - $config->set('upload_maxsize', $maxMb); - } - } - /** * Enforce login support module URLs on admin requests. * @@ -4945,121 +4485,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface // Tenant Restrictions (called from onAfterRoute) // ------------------------------------------------------------------ - /** - * Check admin routes against restriction rules and redirect if blocked. - * - * @return void - * - * @since 02.01.08 - */ - protected function enforceAdminRestrictions() - { - // Master user bypasses ALL restrictions - if ($this->isMasterUser()) - { - return; - } - - $input = $this->app->input; - $option = $input->get('option', ''); - $view = $input->get('view', ''); - $task = $input->get('task', ''); - - // Disable install-from-URL for non-master users - if ($this->params->get('disable_install_url', 1) - && $option === 'com_installer' - && stripos($task, 'install') !== false - && $input->get('installtype') === 'url') - { - $this->blockAccess('Install from URL is disabled.'); - - return; - } - - $blocked = []; - - if ($this->params->get('restrict_installer', 1)) - { - // Allow the update view by default so tenants can update extensions - $allowUpdates = (int) $this->params->get('allow_extension_updates', 1); - - if ($allowUpdates && $option === 'com_installer' - && \in_array($view, ['update', 'updatesites'], true)) - { - // Do not block — update views are permitted - } - elseif ($option === 'com_installer') - { - $this->blockAccess('Access restricted.'); - - return; - } - } - - if ($this->params->get('hide_sysinfo', 1)) - { - $blocked[] = [ - 'option' => 'com_admin', - 'view' => 'sysinfo', - ]; - } - - if ($this->params->get('restrict_global_config', 1)) - { - $blocked[] = [ - 'option' => 'com_config', - 'view' => 'application', - ]; - // Also block empty view (default landing = global config) - if ($option === 'com_config' && $view === '') - { - $this->blockAccess('Access restricted.'); - - return; - } - } - - if ($this->params->get('restrict_template_editing', 1)) - { - $blocked[] = [ - 'option' => 'com_templates', - 'view' => 'template', - ]; - } - - foreach ($blocked as $rule) - { - if ($option !== $rule['option']) - { - continue; - } - - if (isset($rule['view']) && $view !== $rule['view']) - { - continue; - } - - $this->blockAccess('Access restricted.'); - - return; - } - } - - /** - * Redirect to admin dashboard with an error message. - * - * @param string $message Error message to display - * - * @return void - * - * @since 02.01.08 - */ - protected function blockAccess($message) - { - $this->app->enqueueMessage($message, 'error'); - $this->app->redirect(Route::_('index.php', false)); - } - /** * Check whether the current user is the master WaaS user. * @@ -5111,38 +4536,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface return $this->masterNames; } - /** - * Build the list of components to hide from admin menu. - * - * Combines explicit hidden_menu_items config with components that - * are implicitly blocked by other restriction toggles. - * - * @return array Component option strings - * - * @since 02.01.08 - */ - protected function getHiddenMenuComponents() - { - $hidden = array_filter(array_map( - 'trim', - explode("\n", $this->params->get('hidden_menu_items', '')) - )); - - // Auto-hide components that are restricted (keep visible when updates are allowed) - if ($this->params->get('restrict_installer', 1) - && !$this->params->get('allow_extension_updates', 1)) - { - $hidden[] = 'com_installer'; - } - - if ($this->params->get('hide_sysinfo', 1)) - { - $hidden[] = 'com_admin'; - } - - return array_unique($hidden); - } - // ------------------------------------------------------------------ // Atum Template Branding (called from onAfterInitialise) // ------------------------------------------------------------------ From 3be42ec37a94b2786688445845a03442a8efdaaa Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:34:28 +0000 Subject: [PATCH 023/220] chore(version): auto-bump 02.32.28 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 46 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index ef712e3d..0b5649cf 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.27 + 02.32.28 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index dceb1837..a2e32b29 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.27 +# VERSION: 02.32.28 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 04ecefac..9c87b69b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.27 + VERSION: 02.32.28 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 6a1a5eab..ec939793 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 73d1a486..e3143b80 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 6c7ad336..b57ef37b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.27 + VERSION: 02.32.28 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 11eadeb4..be6f2b8b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index b1667089..6042b945 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.27 +VERSION: 02.32.28 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 8d3c9ddc..da50bd69 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.27) +# MokoWaaS Build Guide (VERSION: 02.32.28) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 2fec27ca..d1b1a0f3 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.27) +# MokoWaaS Configuration Guide (VERSION: 02.32.28) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 5a66883d..1aac4b43 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.27) +# MokoWaaS Installation Guide (VERSION: 02.32.28) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 031e15c0..4e8b9791 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.27) +# MokoWaaS Operations Guide (VERSION: 02.32.28) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 8207fab3..34922e38 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.27) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.28) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index b8562421..b61e3826 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.27) +# MokoWaaS Testing Guide (VERSION: 02.32.28) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 9f5eb474..d62d023d 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.27) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.28) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 4959f77f..5277a1c3 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.27) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.28) ## Introduction diff --git a/docs/index.md b/docs/index.md index 0307ee8c..4dcc63cc 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.27 + VERSION: 02.32.28 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.27) +# MokoWaaS Documentation Index (VERSION: 02.32.28) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 4887b3b4..fe1b2ebe 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.27 + VERSION: 02.32.28 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.27) +# MokoWaaS Plugin Overview (VERSION: 02.32.28) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index c7f5982d..6120d93f 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.27 +VERSION: 02.32.28 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index fd260563..7525aed3 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index a38d649b..29e2e210 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index eeb32781..937ded1c 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index cace4024..56f9cb69 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 35e0f22e..b71ef8a0 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 5dd96bf7..f0f60e19 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 8d7ea373..5a515380 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index ca48c877..ec14a45a 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 65127456..371fddd4 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 03b0606f..f367b1ba 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.27 + * VERSION: 02.32.28 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 56244a6f..9162512f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.27 + * VERSION: 02.32.28 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index bcd87cc5..e31c66db 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.27 + * VERSION: 02.32.28 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index b8bd35df..ad32563a 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index c076faf2..af5e5f61 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 5c467471..7fdbc8ff 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.27 + * VERSION: 02.32.28 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 193bf41d..923c09c9 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 986d855f..542b8055 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index c505fb88..955a199f 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 6fc57cac..6e058e54 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 9ae01ec7..8312c120 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 - 02.32.27 + 02.32.28 + 02.32.28 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index ab9cdb7b..b1d39069 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 + 02.32.28 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index f7996fce..cd7481a0 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 - 02.32.27 + 02.32.28 + 02.32.28 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 84273399..a7905728 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.27 - 02.32.27 + 02.32.28 + 02.32.28 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index fcc3bb8d..7952b0c5 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.27 + * VERSION: 02.32.28 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index a09e4f58..67235ec9 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.27 + * VERSION: 02.32.28 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 5e7f2cb5..6494374e 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.27 + 02.32.28 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index c5348bc5..1683cff4 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From b7d90f9b18160d92c8c36b14412a7898cc13268a Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:34:30 +0000 Subject: [PATCH 024/220] chore: update development channel 02.32.28 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 1683cff4..89bdd4da 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.27-dev + 02.32.28-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.27-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.28-dev.zip - bd6356adc7d195a59437462d89bf99bf7834e3802ef933bd0862169867eea0e1 + 6cdd45c78b4673b14637c8160e9f7807f105049bd849751b8da6aa07bdcf0452 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 1cdbfd035d09a701450f7edff52b1583918e75dc Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:52:06 -0500 Subject: [PATCH 025/220] feat: integrate MokoJoomTOS as Offline Bypass feature plugin + add OpenGraph to catalog New plugin: plg_system_mokowaas_tos (Offline Bypass) - Keeps configured pages accessible during offline mode - SEF path matching + Itemid fallback - Custom MenuslugField for multi-select menu items - Include children option for parent menu matching - Renamed from MokoJoomTOS to MokoWaaS Offline Bypass Also: - Added MokoJoomOpenGraph to extension manager catalog - Added to package manifest, script.php, dashboard, cascade list Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/src/Model/DashboardModel.php | 8 + .../admin/src/Model/ExtensionsModel.php | 10 + .../Extension/MokoWaaS.php | 1 + .../en-GB/plg_system_mokowaas_tos.ini | 13 ++ .../en-GB/plg_system_mokowaas_tos.sys.ini | 3 + .../plg_system_mokowaas_tos/mokowaas_tos.xml | 44 +++++ .../services/provider.php | 34 ++++ .../src/Extension/Tos.php | 172 ++++++++++++++++++ .../src/Field/MenuslugField.php | 81 +++++++++ src/pkg_mokowaas.xml | 1 + src/script.php | 2 + 11 files changed, 369 insertions(+) create mode 100644 src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini create mode 100644 src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini create mode 100644 src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml create mode 100644 src/packages/plg_system_mokowaas_tos/services/provider.php create mode 100644 src/packages/plg_system_mokowaas_tos/src/Extension/Tos.php create mode 100644 src/packages/plg_system_mokowaas_tos/src/Field/MenuslugField.php diff --git a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php index b0706f4f..fbc9ab57 100644 --- a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php @@ -45,6 +45,14 @@ class DashboardModel extends BaseDatabaseModel 'protected' => false, 'configure_only' => false, ], + 'mokowaas_tos' => [ + 'icon' => 'icon-globe', + 'category' => 'security', + 'label' => 'Offline Bypass', + 'description' => 'Keep selected pages (TOS, Privacy Policy) accessible during offline mode.', + 'protected' => false, + 'configure_only' => true, + ], 'mokowaas_devtools' => [ 'icon' => 'icon-wrench', 'category' => 'tools', diff --git a/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php b/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php index e8402f12..76e3f6fa 100644 --- a/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php @@ -96,6 +96,16 @@ class ExtensionsModel extends BaseDatabaseModel 'article' => 'https://mokoconsulting.tech/kb/mokogallerycalendar', 'protected' => false, ], + 'MokoJoomOpenGraph' => [ + 'label' => 'MokoJoomOpenGraph', + 'description' => 'Open Graph meta tags for articles, categories, and pages. Controls Facebook, Twitter, and LinkedIn link previews.', + 'element' => 'pkg_mokoog', + 'type' => 'package', + 'icon' => 'icon-share-alt', + 'category' => 'Components', + 'article' => 'https://mokoconsulting.tech/kb/mokojoomopengraph', + 'protected' => false, + ], ]; private const GITEA_URL = 'https://git.mokoconsulting.tech'; diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index eeb32781..506b3c04 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -1424,6 +1424,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $db->quote('mokowaas_firewall'), $db->quote('mokowaas_tenant'), $db->quote('mokowaas_devtools'), + $db->quote('mokowaas_tos'), $db->quote('mod_mokowaas_cpanel'), ]; diff --git a/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini b/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini new file mode 100644 index 00000000..7b75c1e1 --- /dev/null +++ b/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini @@ -0,0 +1,13 @@ +; MokoWaaS Terms of Service Plugin +; Copyright (C) 2026 Moko Consulting. All rights reserved. +; License: GPL-3.0-or-later + +PLG_SYSTEM_MOKOWAAS_TOS="System - MokoWaaS Offline Bypass" +PLG_SYSTEM_MOKOWAAS_TOS_DESC="Keep selected pages (Terms of Service, Privacy Policy, etc.) accessible when the site is in offline mode." + +PLG_SYSTEM_MOKOWAAS_TOS_FIELDSET_BASIC="Offline-Accessible Pages" +PLG_SYSTEM_MOKOWAAS_TOS_SLUG_LABEL="Menu Items to Keep Online" +PLG_SYSTEM_MOKOWAAS_TOS_SLUG_DESC="Select menu items that remain accessible during offline mode. Hold Ctrl/Cmd for multiple." +PLG_SYSTEM_MOKOWAAS_TOS_CHILDREN_LABEL="Include Child Menu Items" +PLG_SYSTEM_MOKOWAAS_TOS_CHILDREN_DESC="Also allow access to child pages under the selected items." +PLG_SYSTEM_MOKOWAAS_TOS_SEF_WARNING="SEF URLs are disabled - path matching requires SEF. Itemid fallback is active." diff --git a/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini b/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini new file mode 100644 index 00000000..cf84d46a --- /dev/null +++ b/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini @@ -0,0 +1,3 @@ +; MokoWaaS Terms of Service Plugin - System strings +PLG_SYSTEM_MOKOWAAS_TOS="System - MokoWaaS Offline Bypass" +PLG_SYSTEM_MOKOWAAS_TOS_DESC="Keep selected pages (Terms of Service, Privacy Policy, etc.) accessible when the site is in offline mode." diff --git a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml new file mode 100644 index 00000000..57ad3388 --- /dev/null +++ b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml @@ -0,0 +1,44 @@ + + + System - MokoWaaS Offline Bypass + mokowaas_tos + Moko Consulting + 2026-06-02 + Copyright (C) 2026 Moko Consulting. All rights reserved. + GPL-3.0-or-later + hello@mokoconsulting.tech + https://mokoconsulting.tech + 02.32.00 + PLG_SYSTEM_MOKOWAAS_TOS_DESC + Moko\Plugin\System\MokoWaaSTos + + + src + services + language + + + + en-GB/plg_system_mokowaas_tos.ini + en-GB/plg_system_mokowaas_tos.sys.ini + + + + +
+ + + + + + +
+ + + diff --git a/src/packages/plg_system_mokowaas_tos/services/provider.php b/src/packages/plg_system_mokowaas_tos/services/provider.php new file mode 100644 index 00000000..8a7f163e --- /dev/null +++ b/src/packages/plg_system_mokowaas_tos/services/provider.php @@ -0,0 +1,34 @@ +set( + PluginInterface::class, + function (Container $container) { + $dispatcher = $container->get(DispatcherInterface::class); + $plugin = new Tos($dispatcher, (array) PluginHelper::getPlugin('system', 'mokowaas_tos')); + $plugin->setApplication(Factory::getApplication()); + + return $plugin; + } + ); + } +}; diff --git a/src/packages/plg_system_mokowaas_tos/src/Extension/Tos.php b/src/packages/plg_system_mokowaas_tos/src/Extension/Tos.php new file mode 100644 index 00000000..8ef01ed0 --- /dev/null +++ b/src/packages/plg_system_mokowaas_tos/src/Extension/Tos.php @@ -0,0 +1,172 @@ + 'onAfterRoute', + ]; + } + + public function onAfterRoute(): void + { + $app = $this->getApplication(); + + if (!$app->isClient('site')) + { + return; + } + + $config = $app->getConfig(); + + if (!$config->get('offline')) + { + return; + } + + $slugs = $this->params->get('tos_slug', []); + + if (\is_string($slugs)) + { + $slugs = array_filter([trim($slugs)]); + } + else + { + $slugs = (array) $slugs; + } + + if (empty($slugs)) + { + return; + } + + $includeChildren = (int) $this->params->get('include_children', 1); + + if ($this->matchByPath($slugs, $config, $app, $includeChildren)) + { + return; + } + + $this->matchByItemId($slugs, $config, $app, $includeChildren); + } + + private function matchByPath(array $slugs, $config, $app, int $includeChildren = 1): bool + { + $uri = Uri::getInstance(); + $path = urldecode(trim($uri->getPath(), '/')); + + $base = trim(Uri::base(true), '/'); + + if (!empty($base) && strpos($path, $base) === 0) + { + $path = trim(substr($path, \strlen($base)), '/'); + } + + if (empty($path) || $path === 'index.php') + { + return false; + } + + foreach ($slugs as $slug) + { + $slug = trim((string) $slug); + + if (empty($slug)) + { + continue; + } + + if ($path === $slug || ($includeChildren && strpos($path, $slug . '/') === 0)) + { + $this->bypassOffline($config, $app); + + return true; + } + } + + return false; + } + + private function matchByItemId(array $slugs, $config, $app, int $includeChildren = 1): bool + { + $itemId = (int) $app->getInput()->getInt('Itemid', 0); + + if (!$itemId) + { + return false; + } + + try + { + $db = Factory::getDbo(); + $query = $db->getQuery(true) + ->select($db->quoteName('path')) + ->from($db->quoteName('#__menu')) + ->where($db->quoteName('id') . ' = ' . $itemId) + ->where($db->quoteName('published') . ' = 1') + ->where($db->quoteName('client_id') . ' = 0'); + $db->setQuery($query); + $menuPath = trim((string) $db->loadResult(), '/'); + + if (empty($menuPath)) + { + return false; + } + + foreach ($slugs as $slug) + { + $slug = trim((string) $slug); + + if (empty($slug)) + { + continue; + } + + if ($menuPath === $slug || ($includeChildren && strpos($menuPath, $slug . '/') === 0)) + { + $this->bypassOffline($config, $app); + + return true; + } + } + } + catch (\Throwable $e) + { + // Silent + } + + return false; + } + + private function bypassOffline($config, $app): void + { + $config->set('offline', 0); + $app->getInput()->set('tmpl', 'component'); + } +} diff --git a/src/packages/plg_system_mokowaas_tos/src/Field/MenuslugField.php b/src/packages/plg_system_mokowaas_tos/src/Field/MenuslugField.php new file mode 100644 index 00000000..c9dd7ede --- /dev/null +++ b/src/packages/plg_system_mokowaas_tos/src/Field/MenuslugField.php @@ -0,0 +1,81 @@ +get('sef', true); + + if (!$sef) + { + $options[] = (object) [ + 'value' => '', + 'text' => Text::_('PLG_SYSTEM_MOKOWAAS_TOS_SEF_WARNING'), + 'disabled' => true, + ]; + } + } + catch (\Throwable $e) + { + // Ignore + } + + try + { + $db = Factory::getDbo(); + $query = $db->getQuery(true) + ->select($db->quoteName(['path', 'alias', 'title', 'menutype'])) + ->from($db->quoteName('#__menu')) + ->where($db->quoteName('published') . ' = 1') + ->where($db->quoteName('client_id') . ' = 0') + ->where($db->quoteName('alias') . ' != ' . $db->quote('')) + ->order($db->quoteName('menutype') . ', ' . $db->quoteName('title')); + $db->setQuery($query); + $menuItems = $db->loadObjectList(); + + $lastMenuType = ''; + + foreach ($menuItems ?: [] as $item) + { + if ($item->menutype !== $lastMenuType) + { + if ($lastMenuType !== '') + { + $options[] = (object) ['value' => '', 'text' => '──────────────', 'disabled' => true]; + } + + $lastMenuType = $item->menutype; + } + + $label = $item->title !== '' ? $item->title : ucwords(str_replace(['-', '_'], ' ', $item->alias)); + $options[] = (object) ['value' => $item->path, 'text' => $label . ' (/' . $item->path . ')']; + } + } + catch (\Throwable $e) + { + // Silent + } + + return $options; + } +} diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 5e7f2cb5..9ee89893 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -17,6 +17,7 @@ plg_system_mokowaas_firewall.zip plg_system_mokowaas_tenant.zip plg_system_mokowaas_devtools.zip + plg_system_mokowaas_tos.zip com_mokowaas.zip mod_mokowaas_cpanel.zip plg_webservices_mokowaas.zip diff --git a/src/script.php b/src/script.php index 481deb61..7bf3d369 100644 --- a/src/script.php +++ b/src/script.php @@ -42,6 +42,7 @@ class Pkg_MokowaasInstallerScript $this->enablePlugin('system', 'mokowaas_firewall'); $this->enablePlugin('system', 'mokowaas_tenant'); $this->enablePlugin('system', 'mokowaas_devtools'); + $this->enablePlugin('system', 'mokowaas_tos'); $this->enablePlugin('webservices', 'mokowaas'); $this->enablePlugin('task', 'mokowaasdemo'); $this->enablePlugin('task', 'mokowaassync'); @@ -289,6 +290,7 @@ class Pkg_MokowaasInstallerScript $db->quote('mokowaas_firewall'), $db->quote('mokowaas_tenant'), $db->quote('mokowaas_devtools'), + $db->quote('mokowaas_tos'), $db->quote('com_mokowaas'), $db->quote('mod_mokowaas_cpanel'), $db->quote('mokowaasdemo'), From b5eebb0acc50ce10631976acd4fb6bfec367fe02 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:52:38 +0000 Subject: [PATCH 026/220] chore(version): auto-bump 02.32.29 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 0b5649cf..acf14d0d 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.28 + 02.32.29 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index a2e32b29..2f24d8d5 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.28 +# VERSION: 02.32.29 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c87b69b..75ee0bf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.28 + VERSION: 02.32.29 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ec939793..a30ba58e 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index e3143b80..3dbaed08 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index b57ef37b..4e50bb5a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.28 + VERSION: 02.32.29 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index be6f2b8b..de95840f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 6042b945..cc3b847e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.28 +VERSION: 02.32.29 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index da50bd69..fc156937 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.28) +# MokoWaaS Build Guide (VERSION: 02.32.29) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index d1b1a0f3..d979fd95 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.28) +# MokoWaaS Configuration Guide (VERSION: 02.32.29) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 1aac4b43..5db5ca29 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.28) +# MokoWaaS Installation Guide (VERSION: 02.32.29) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 4e8b9791..b776c12e 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.28) +# MokoWaaS Operations Guide (VERSION: 02.32.29) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 34922e38..ba9ccd5f 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.28) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.29) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index b61e3826..aae3cece 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.28) +# MokoWaaS Testing Guide (VERSION: 02.32.29) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index d62d023d..7c3f8229 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.28) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.29) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 5277a1c3..4e660ffc 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.28) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.29) ## Introduction diff --git a/docs/index.md b/docs/index.md index 4dcc63cc..4af69591 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.28 + VERSION: 02.32.29 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.28) +# MokoWaaS Documentation Index (VERSION: 02.32.29) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index fe1b2ebe..bf580d99 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.28 + VERSION: 02.32.29 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.28) +# MokoWaaS Plugin Overview (VERSION: 02.32.29) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 6120d93f..5d074982 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.28 +VERSION: 02.32.29 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 7525aed3..83fbe3ca 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 29e2e210..eef74356 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index fcca7e3d..e1265035 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 56f9cb69..b4289e5b 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index b71ef8a0..fbe2d5a1 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index f0f60e19..2df7ef31 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 5a515380..bcaadc3e 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index ec14a45a..bcea8a2c 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 371fddd4..eb730be7 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index f367b1ba..6f96e9e5 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.28 + * VERSION: 02.32.29 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 9162512f..25e1d3cf 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.28 + * VERSION: 02.32.29 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index e31c66db..cee76c53 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.28 + * VERSION: 02.32.29 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index ad32563a..8afe3ba3 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index af5e5f61..6b9ad20a 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 7fdbc8ff..85928e30 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.28 + * VERSION: 02.32.29 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 923c09c9..4c8495e8 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 542b8055..a7391822 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 955a199f..b4bc3ee1 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 6e058e54..451a5fcb 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml index 57ad3388..cb9ae8ac 100644 --- a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml +++ b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.00 + 02.32.29 PLG_SYSTEM_MOKOWAAS_TOS_DESC Moko\Plugin\System\MokoWaaSTos diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 8312c120..a7b0d169 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 - 02.32.28 + 02.32.29 + 02.32.29 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index b1d39069..0b767b67 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 + 02.32.29 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index cd7481a0..a2a96c39 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 - 02.32.28 + 02.32.29 + 02.32.29 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index a7905728..838079c5 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.28 - 02.32.28 + 02.32.29 + 02.32.29 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 7952b0c5..64ff4f4f 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.28 + * VERSION: 02.32.29 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 67235ec9..32bbc300 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.28 + * VERSION: 02.32.29 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 24bc8c8f..ffcfb876 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.28 + 02.32.29 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 89bdd4da..c04ece08 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 25e2c29e2ef427015e53acac3943749761d3a5de Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:52:39 +0000 Subject: [PATCH 027/220] chore: update development channel 02.32.29 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index c04ece08..47048f13 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.28-dev + 02.32.29-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.28-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.29-dev.zip - 6cdd45c78b4673b14637c8160e9f7807f105049bd849751b8da6aa07bdcf0452 + 3b7268eddee7ad3b927b1a174132a44892a058a4716dfecf3708f628fd1e087a dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 0e5caf6b3fe15af348a7c690a2db69a00f3f5cc5 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 14:58:24 -0500 Subject: [PATCH 028/220] fix: move boot() session lifetime logic from core to firewall plugin Core plugin's boot() called ipIsTrusted() which was deleted in the cleanup. The session lifetime extension for trusted IPs is now in the firewall plugin's boot() method where ipIsTrusted() still exists. Firewall now implements BootableExtensionInterface. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Extension/MokoWaaS.php | 15 +----------- .../src/Extension/Firewall.php | 23 ++++++++++++++++++- 2 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index fcca7e3d..17240ed5 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -161,20 +161,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface */ public function boot(ContainerInterface $container): void { - $timeout = (int) $this->params->get('admin_session_timeout', 0); - - if ($timeout <= 0) - { - return; - } - - if ($this->ipIsTrusted()) - { - // Set both PHP and Joomla session lifetimes before the - // session handler runs its expiry check. - ini_set('session.gc_maxlifetime', 315360000); - Factory::getConfig()->set('lifetime', 525600); - } + // Session lifetime for trusted IPs is now handled by the firewall plugin } /** diff --git a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php index c2b096b3..b7b82181 100644 --- a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php +++ b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php @@ -10,12 +10,14 @@ namespace Moko\Plugin\System\MokoWaaSFirewall\Extension; defined('_JEXEC') or die; +use Joomla\CMS\Extension\BootableExtensionInterface; use Joomla\CMS\Factory; use Joomla\CMS\Log\Log; use Joomla\CMS\Plugin\CMSPlugin; use Joomla\CMS\Router\Route; use Joomla\Event\SubscriberInterface; use Moko\Plugin\System\MokoWaaS\Helper\MokoWaaSHelper; +use Psr\Container\ContainerInterface; /** * MokoWaaS Firewall Plugin @@ -25,10 +27,29 @@ use Moko\Plugin\System\MokoWaaS\Helper\MokoWaaSHelper; * * @since 02.32.00 */ -class Firewall extends CMSPlugin implements SubscriberInterface +class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensionInterface { protected $autoloadLanguage = true; + /** + * Extend session lifetime for trusted IPs before Joomla creates the session. + */ + public function boot(ContainerInterface $container): void + { + $timeout = (int) $this->params->get('admin_session_timeout', 0); + + if ($timeout <= 0) + { + return; + } + + if ($this->ipIsTrusted()) + { + ini_set('session.gc_maxlifetime', 315360000); + Factory::getConfig()->set('lifetime', 525600); + } + } + private const BLOCKED_FILES = [ 'htaccess.txt', 'web.config.txt', 'configuration.php-dist', 'README.txt', 'LICENSE.txt', 'joomla.xml', 'robots.txt.dist', From 8ea724116c786c800f279a0fc7a8641c31562cbb Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:59:12 +0000 Subject: [PATCH 029/220] chore(version): auto-bump 02.32.30 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index acf14d0d..affd44f8 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.29 + 02.32.30 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 2f24d8d5..319cb7ce 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.29 +# VERSION: 02.32.30 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 75ee0bf9..35b0e325 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.29 + VERSION: 02.32.30 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index a30ba58e..c2b42365 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 3dbaed08..2f58c5c6 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 4e50bb5a..ed3df2b9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.29 + VERSION: 02.32.30 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index de95840f..0e4241f2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index cc3b847e..16f7a364 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.29 +VERSION: 02.32.30 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index fc156937..d86dfe86 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.29) +# MokoWaaS Build Guide (VERSION: 02.32.30) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index d979fd95..e20ffbab 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.29) +# MokoWaaS Configuration Guide (VERSION: 02.32.30) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 5db5ca29..c7cbc95e 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.29) +# MokoWaaS Installation Guide (VERSION: 02.32.30) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index b776c12e..0deec5fa 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.29) +# MokoWaaS Operations Guide (VERSION: 02.32.30) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index ba9ccd5f..41bd94bd 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.29) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.30) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index aae3cece..6a874599 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.29) +# MokoWaaS Testing Guide (VERSION: 02.32.30) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 7c3f8229..631ccf87 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.29) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.30) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 4e660ffc..c6ab537d 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.29) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.30) ## Introduction diff --git a/docs/index.md b/docs/index.md index 4af69591..3d3f38de 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.29 + VERSION: 02.32.30 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.29) +# MokoWaaS Documentation Index (VERSION: 02.32.30) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index bf580d99..0531656e 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.29 + VERSION: 02.32.30 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.29) +# MokoWaaS Plugin Overview (VERSION: 02.32.30) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 5d074982..682915f1 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.29 +VERSION: 02.32.30 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 83fbe3ca..27472927 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index eef74356..47ff686f 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index b59dcf48..792ba48e 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index b4289e5b..b9d0d35b 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index fbe2d5a1..34c95098 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 2df7ef31..f0e66740 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index bcaadc3e..95aaa25f 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index bcea8a2c..568a1071 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index eb730be7..e86ee064 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 6f96e9e5..2c453f9f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.29 + * VERSION: 02.32.30 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 25e1d3cf..cc82edee 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.29 + * VERSION: 02.32.30 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index cee76c53..da93885c 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.29 + * VERSION: 02.32.30 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 8afe3ba3..44354e45 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 6b9ad20a..60326d09 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 85928e30..eacff21b 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.29 + * VERSION: 02.32.30 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 4c8495e8..e35a7f85 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index a7391822..117bbe0a 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index b4bc3ee1..56c425e8 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 451a5fcb..5df1feee 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml index cb9ae8ac..682c698b 100644 --- a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml +++ b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 PLG_SYSTEM_MOKOWAAS_TOS_DESC Moko\Plugin\System\MokoWaaSTos diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index a7b0d169..057f45ea 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 - 02.32.29 + 02.32.30 + 02.32.30 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 0b767b67..596224f4 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 + 02.32.30 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index a2a96c39..470922ba 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 - 02.32.29 + 02.32.30 + 02.32.30 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 838079c5..cf4e5982 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.29 - 02.32.29 + 02.32.30 + 02.32.30 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 64ff4f4f..cbc0689f 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.29 + * VERSION: 02.32.30 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 32bbc300..e4f7644c 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.29 + * VERSION: 02.32.30 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index ffcfb876..812fbe3a 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.29 + 02.32.30 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 47048f13..521a7a39 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From db260008a2e6cbd29d15cbd09a4a53cda9371d49 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 19:59:14 +0000 Subject: [PATCH 030/220] chore: update development channel 02.32.30 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 521a7a39..3c17532b 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.29-dev + 02.32.30-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.29-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.30-dev.zip - 3b7268eddee7ad3b927b1a174132a44892a058a4716dfecf3708f628fd1e087a + a41c5d16c26c906a33de21bb415a819dc9ed6db9d45d3ca3d99cc8c33eb94d05 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 7f64651517695aee0f07785fd7280077c52765d4 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 15:25:08 -0500 Subject: [PATCH 031/220] feat: helpdesk / ticket system with SLA tracking Full helpdesk built into com_mokowaas: Ticket List View (view=tickets): - Status summary cards (open, in progress, waiting, resolved, closed, SLA overdue) - Filterable table (status, priority, category) - SLA highlighting (red=overdue, yellow=at risk) - New ticket modal with category, priority, description Ticket Detail View (view=ticket): - Conversation thread with replies - Internal notes (staff-only, yellow highlight) - Canned response selector - Status action buttons (reopen, in progress, waiting, resolve, close) - SLA response/resolution due with overdue indicators - Ticket metadata sidebar Model (TicketsModel): - getTickets with filters, getTicket with replies - createTicket with auto-assign from category + SLA deadlines - addReply with SLA response tracking - updateStatus with resolved/closed timestamps - getCategories, getCannedResponses - getStatusCounts, getOverdueTickets Database: - #__mokowaas_tickets (status, priority, SLA fields) - #__mokowaas_ticket_replies (with internal notes) - #__mokowaas_ticket_categories (SLA + auto-assign config) - #__mokowaas_ticket_canned (response templates) - 5 default categories with SLA presets Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/language/en-GB/com_mokowaas.ini | 1 + .../admin/language/en-GB/com_mokowaas.sys.ini | 1 + .../com_mokowaas/admin/sql/install.mysql.sql | 70 ++++ .../src/Controller/DisplayController.php | 66 ++++ .../admin/src/Model/TicketsModel.php | 353 ++++++++++++++++++ .../admin/src/View/Ticket/HtmlView.php | 53 +++ .../admin/src/View/Tickets/HtmlView.php | 54 +++ .../admin/tmpl/ticket/default.php | 198 ++++++++++ .../admin/tmpl/tickets/default.php | 181 +++++++++ src/packages/com_mokowaas/mokowaas.xml | 6 + 10 files changed, 983 insertions(+) create mode 100644 src/packages/com_mokowaas/admin/sql/install.mysql.sql create mode 100644 src/packages/com_mokowaas/admin/src/Model/TicketsModel.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Ticket/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/ticket/default.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/tickets/default.php diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini index e11af07b..d7713042 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini @@ -20,3 +20,4 @@ COM_MOKOWAAS_EXTENSIONS_TITLE="Moko Extensions" COM_MOKOWAAS_EXTENSIONS_INFO="Install Moko Consulting Joomla packages from the official release server. Updates are handled through Joomla's native System > Update mechanism — each package registers its own update server." COM_MOKOWAAS_EXTENSIONS_LINK="Moko Extensions" COM_MOKOWAAS_HTACCESS_TITLE=".htaccess Maker" +COM_MOKOWAAS_TICKETS_TITLE="Helpdesk" diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini index 4ec41890..bd380654 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini @@ -10,5 +10,6 @@ COM_MOKOWAAS_MENU_EXTENSIONS="Moko Extensions" COM_MOKOWAAS_MENU_PLUGINS="Feature Plugins" COM_MOKOWAAS_MENU_UPDATES="Joomla Updates" COM_MOKOWAAS_MENU_CHECKIN="Global Check-in" +COM_MOKOWAAS_MENU_TICKETS="Helpdesk" COM_MOKOWAAS_MENU_HTACCESS=".htaccess Maker" COM_MOKOWAAS_MENU_CACHE="Cache Management" diff --git a/src/packages/com_mokowaas/admin/sql/install.mysql.sql b/src/packages/com_mokowaas/admin/sql/install.mysql.sql new file mode 100644 index 00000000..12dbca53 --- /dev/null +++ b/src/packages/com_mokowaas/admin/sql/install.mysql.sql @@ -0,0 +1,70 @@ +-- +-- MokoWaaS Helpdesk Tables +-- + +CREATE TABLE IF NOT EXISTS `#__mokowaas_ticket_categories` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `title` VARCHAR(255) NOT NULL, + `alias` VARCHAR(255) NOT NULL DEFAULT '', + `description` TEXT, + `auto_assign_user` INT DEFAULT NULL, + `sla_response_minutes` INT UNSIGNED NOT NULL DEFAULT 480, + `sla_resolution_minutes` INT UNSIGNED NOT NULL DEFAULT 2880, + `ordering` INT NOT NULL DEFAULT 0, + `published` TINYINT NOT NULL DEFAULT 1, + PRIMARY KEY (`id`), + KEY `idx_alias` (`alias`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE IF NOT EXISTS `#__mokowaas_tickets` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `subject` VARCHAR(512) NOT NULL, + `body` TEXT NOT NULL, + `status` ENUM('open','in_progress','waiting','resolved','closed') NOT NULL DEFAULT 'open', + `priority` ENUM('low','normal','high','urgent') NOT NULL DEFAULT 'normal', + `category_id` INT UNSIGNED DEFAULT NULL, + `created_by` INT NOT NULL DEFAULT 0, + `assigned_to` INT DEFAULT NULL, + `created` DATETIME NOT NULL, + `modified` DATETIME DEFAULT NULL, + `resolved` DATETIME DEFAULT NULL, + `closed` DATETIME DEFAULT NULL, + `sla_response_due` DATETIME DEFAULT NULL, + `sla_resolution_due` DATETIME DEFAULT NULL, + `sla_responded` TINYINT NOT NULL DEFAULT 0, + PRIMARY KEY (`id`), + KEY `idx_status` (`status`), + KEY `idx_priority` (`priority`), + KEY `idx_assigned` (`assigned_to`), + KEY `idx_category` (`category_id`), + KEY `idx_created` (`created`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE IF NOT EXISTS `#__mokowaas_ticket_replies` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `ticket_id` INT UNSIGNED NOT NULL, + `user_id` INT NOT NULL DEFAULT 0, + `body` TEXT NOT NULL, + `is_internal` TINYINT NOT NULL DEFAULT 0, + `created` DATETIME NOT NULL, + PRIMARY KEY (`id`), + KEY `idx_ticket` (`ticket_id`), + KEY `idx_created` (`created`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE IF NOT EXISTS `#__mokowaas_ticket_canned` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `title` VARCHAR(255) NOT NULL, + `body` TEXT NOT NULL, + `category_id` INT UNSIGNED DEFAULT NULL, + `ordering` INT NOT NULL DEFAULT 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- Default categories +INSERT IGNORE INTO `#__mokowaas_ticket_categories` (`id`, `title`, `alias`, `description`, `sla_response_minutes`, `sla_resolution_minutes`, `ordering`) VALUES +(1, 'General Support', 'general-support', 'General questions and assistance', 480, 2880, 1), +(2, 'Bug Report', 'bug-report', 'Report a software bug or issue', 240, 1440, 2), +(3, 'Feature Request', 'feature-request', 'Request a new feature or enhancement', 1440, 10080, 3), +(4, 'Billing', 'billing', 'Billing, invoicing, and payment questions', 240, 1440, 4), +(5, 'Urgent / Outage', 'urgent-outage', 'Site down or critical issue', 60, 240, 5); diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index 6cfebbbe..a4f3fc62 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -189,4 +189,70 @@ class DisplayController extends BaseController ]); $app->close(); } + + /** + * Create a new support ticket. + */ + public function createTicket() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $app = Factory::getApplication(); + $input = $app->getInput(); + $model = $this->getModel('Tickets'); + + $result = $model->createTicket([ + 'subject' => $input->getString('subject', ''), + 'body' => $input->getRaw('body', ''), + 'priority' => $input->getString('priority', 'normal'), + 'category_id' => $input->getInt('category_id', 0), + ]); + + $app->setHeader('Content-Type', 'application/json'); + echo json_encode($result); + $app->close(); + } + + /** + * Add a reply to a ticket. + */ + public function addTicketReply() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $app = Factory::getApplication(); + $input = $app->getInput(); + $model = $this->getModel('Tickets'); + + $result = $model->addReply( + $input->getInt('ticket_id', 0), + $input->getRaw('body', ''), + (bool) $input->getInt('is_internal', 0) + ); + + $app->setHeader('Content-Type', 'application/json'); + echo json_encode($result); + $app->close(); + } + + /** + * Update ticket status. + */ + public function updateTicketStatus() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $app = Factory::getApplication(); + $input = $app->getInput(); + $model = $this->getModel('Tickets'); + + $result = $model->updateStatus( + $input->getInt('ticket_id', 0), + $input->getString('status', '') + ); + + $app->setHeader('Content-Type', 'application/json'); + echo json_encode($result); + $app->close(); + } } diff --git a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php new file mode 100644 index 00000000..c4245d67 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php @@ -0,0 +1,353 @@ +getDatabase(); + $query = $db->getQuery(true) + ->select([ + $db->quoteName('t.id'), + $db->quoteName('t.subject'), + $db->quoteName('t.status'), + $db->quoteName('t.priority'), + $db->quoteName('t.created'), + $db->quoteName('t.modified'), + $db->quoteName('t.sla_response_due'), + $db->quoteName('t.sla_resolution_due'), + $db->quoteName('t.sla_responded'), + $db->quoteName('c.title', 'category_title'), + $db->quoteName('u.name', 'created_by_name'), + $db->quoteName('a.name', 'assigned_to_name'), + ]) + ->from($db->quoteName('#__mokowaas_tickets', 't')) + ->leftJoin($db->quoteName('#__mokowaas_ticket_categories', 'c') . ' ON c.id = t.category_id') + ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = t.created_by') + ->leftJoin($db->quoteName('#__users', 'a') . ' ON a.id = t.assigned_to'); + + if (!empty($filters['status'])) + { + $query->where($db->quoteName('t.status') . ' = ' . $db->quote($filters['status'])); + } + + if (!empty($filters['priority'])) + { + $query->where($db->quoteName('t.priority') . ' = ' . $db->quote($filters['priority'])); + } + + if (!empty($filters['assigned_to'])) + { + $query->where($db->quoteName('t.assigned_to') . ' = ' . (int) $filters['assigned_to']); + } + + if (!empty($filters['category_id'])) + { + $query->where($db->quoteName('t.category_id') . ' = ' . (int) $filters['category_id']); + } + + $query->order($db->quoteName('t.created') . ' DESC'); + $query->setLimit(50); + + $db->setQuery($query); + + return $db->loadObjectList() ?: []; + } + + /** + * Get a single ticket with all replies. + */ + public function getTicket(int $id): ?object + { + $db = $this->getDatabase(); + $query = $db->getQuery(true) + ->select([ + $db->quoteName('t') . '.*', + $db->quoteName('c.title', 'category_title'), + $db->quoteName('u.name', 'created_by_name'), + $db->quoteName('u.email', 'created_by_email'), + $db->quoteName('a.name', 'assigned_to_name'), + ]) + ->from($db->quoteName('#__mokowaas_tickets', 't')) + ->leftJoin($db->quoteName('#__mokowaas_ticket_categories', 'c') . ' ON c.id = t.category_id') + ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = t.created_by') + ->leftJoin($db->quoteName('#__users', 'a') . ' ON a.id = t.assigned_to') + ->where($db->quoteName('t.id') . ' = ' . $id); + $db->setQuery($query); + $ticket = $db->loadObject(); + + if (!$ticket) + { + return null; + } + + // Load replies + $query = $db->getQuery(true) + ->select([ + $db->quoteName('r') . '.*', + $db->quoteName('u.name', 'user_name'), + ]) + ->from($db->quoteName('#__mokowaas_ticket_replies', 'r')) + ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = r.user_id') + ->where($db->quoteName('r.ticket_id') . ' = ' . $id) + ->order($db->quoteName('r.created') . ' ASC'); + $db->setQuery($query); + $ticket->replies = $db->loadObjectList() ?: []; + + // Reply count + $ticket->reply_count = \count($ticket->replies); + + return $ticket; + } + + /** + * Create a new ticket. + */ + public function createTicket(array $data): array + { + try + { + $db = $this->getDatabase(); + $user = Factory::getApplication()->getIdentity(); + $now = Factory::getDate()->toSql(); + + $ticket = (object) [ + 'subject' => $data['subject'] ?? '', + 'body' => $data['body'] ?? '', + 'status' => 'open', + 'priority' => $data['priority'] ?? 'normal', + 'category_id' => (int) ($data['category_id'] ?? 0) ?: null, + 'created_by' => $user->id, + 'assigned_to' => (int) ($data['assigned_to'] ?? 0) ?: null, + 'created' => $now, + 'modified' => $now, + ]; + + // Auto-assign from category + if (!$ticket->assigned_to && $ticket->category_id) + { + $query = $db->getQuery(true) + ->select($db->quoteName('auto_assign_user')) + ->from($db->quoteName('#__mokowaas_ticket_categories')) + ->where($db->quoteName('id') . ' = ' . (int) $ticket->category_id); + $db->setQuery($query); + $autoAssign = (int) $db->loadResult(); + + if ($autoAssign) + { + $ticket->assigned_to = $autoAssign; + } + } + + // SLA deadlines from category + if ($ticket->category_id) + { + $query = $db->getQuery(true) + ->select([$db->quoteName('sla_response_minutes'), $db->quoteName('sla_resolution_minutes')]) + ->from($db->quoteName('#__mokowaas_ticket_categories')) + ->where($db->quoteName('id') . ' = ' . (int) $ticket->category_id); + $db->setQuery($query); + $sla = $db->loadObject(); + + if ($sla) + { + $ticket->sla_response_due = Factory::getDate($now)->modify('+' . (int) $sla->sla_response_minutes . ' minutes')->toSql(); + $ticket->sla_resolution_due = Factory::getDate($now)->modify('+' . (int) $sla->sla_resolution_minutes . ' minutes')->toSql(); + } + } + + $db->insertObject('#__mokowaas_tickets', $ticket, 'id'); + + return ['success' => true, 'message' => 'Ticket #' . $ticket->id . ' created.', 'id' => (int) $ticket->id]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Failed: ' . $e->getMessage()]; + } + } + + /** + * Add a reply to a ticket. + */ + public function addReply(int $ticketId, string $body, bool $isInternal = false): array + { + try + { + $db = $this->getDatabase(); + $user = Factory::getApplication()->getIdentity(); + $now = Factory::getDate()->toSql(); + + $reply = (object) [ + 'ticket_id' => $ticketId, + 'user_id' => $user->id, + 'body' => $body, + 'is_internal' => $isInternal ? 1 : 0, + 'created' => $now, + ]; + + $db->insertObject('#__mokowaas_ticket_replies', $reply, 'id'); + + // Mark SLA as responded if first staff reply + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_tickets')) + ->set($db->quoteName('modified') . ' = ' . $db->quote($now)) + ->set($db->quoteName('sla_responded') . ' = 1') + ->where($db->quoteName('id') . ' = ' . $ticketId) + ->where($db->quoteName('sla_responded') . ' = 0') + )->execute(); + + return ['success' => true, 'message' => 'Reply added.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Failed: ' . $e->getMessage()]; + } + } + + /** + * Update ticket status. + */ + public function updateStatus(int $ticketId, string $status): array + { + $valid = ['open', 'in_progress', 'waiting', 'resolved', 'closed']; + + if (!\in_array($status, $valid, true)) + { + return ['success' => false, 'message' => 'Invalid status.']; + } + + try + { + $db = $this->getDatabase(); + $now = Factory::getDate()->toSql(); + + $sets = [ + $db->quoteName('status') . ' = ' . $db->quote($status), + $db->quoteName('modified') . ' = ' . $db->quote($now), + ]; + + if ($status === 'resolved') + { + $sets[] = $db->quoteName('resolved') . ' = ' . $db->quote($now); + } + + if ($status === 'closed') + { + $sets[] = $db->quoteName('closed') . ' = ' . $db->quote($now); + } + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_tickets')) + ->set($sets) + ->where($db->quoteName('id') . ' = ' . $ticketId) + )->execute(); + + return ['success' => true, 'message' => 'Status updated to ' . $status . '.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Failed: ' . $e->getMessage()]; + } + } + + /** + * Get all ticket categories. + */ + public function getCategories(): array + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_ticket_categories')) + ->where($db->quoteName('published') . ' = 1') + ->order($db->quoteName('ordering') . ' ASC') + ); + + return $db->loadObjectList() ?: []; + } + + /** + * Get canned responses, optionally filtered by category. + */ + public function getCannedResponses(int $categoryId = 0): array + { + $db = $this->getDatabase(); + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_ticket_canned')) + ->order($db->quoteName('ordering') . ' ASC'); + + if ($categoryId) + { + $query->where('(' . $db->quoteName('category_id') . ' = ' . $categoryId + . ' OR ' . $db->quoteName('category_id') . ' IS NULL)'); + } + + $db->setQuery($query); + + return $db->loadObjectList() ?: []; + } + + /** + * Get ticket counts by status for dashboard. + */ + public function getStatusCounts(): object + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select([$db->quoteName('status'), 'COUNT(*) AS ' . $db->quoteName('cnt')]) + ->from($db->quoteName('#__mokowaas_tickets')) + ->group($db->quoteName('status')) + ); + $rows = $db->loadObjectList('status') ?: []; + + return (object) [ + 'open' => (int) ($rows['open']->cnt ?? 0), + 'in_progress' => (int) ($rows['in_progress']->cnt ?? 0), + 'waiting' => (int) ($rows['waiting']->cnt ?? 0), + 'resolved' => (int) ($rows['resolved']->cnt ?? 0), + 'closed' => (int) ($rows['closed']->cnt ?? 0), + 'total' => array_sum(array_map(fn($r) => (int) $r->cnt, $rows)), + ]; + } + + /** + * Get overdue tickets (SLA breached). + */ + public function getOverdueTickets(): array + { + $db = $this->getDatabase(); + $now = Factory::getDate()->toSql(); + + $query = $db->getQuery(true) + ->select([$db->quoteName('id'), $db->quoteName('subject'), $db->quoteName('priority'), + $db->quoteName('sla_response_due'), $db->quoteName('sla_resolution_due'), $db->quoteName('sla_responded')]) + ->from($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('status') . ' NOT IN (' . $db->quote('resolved') . ',' . $db->quote('closed') . ')') + ->where('((' . $db->quoteName('sla_response_due') . ' < ' . $db->quote($now) . ' AND ' . $db->quoteName('sla_responded') . ' = 0)' + . ' OR ' . $db->quoteName('sla_resolution_due') . ' < ' . $db->quote($now) . ')') + ->order($db->quoteName('sla_resolution_due') . ' ASC'); + $db->setQuery($query); + + return $db->loadObjectList() ?: []; + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Ticket/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Ticket/HtmlView.php new file mode 100644 index 00000000..b4c00476 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Ticket/HtmlView.php @@ -0,0 +1,53 @@ +getModel('Tickets'); + $id = Factory::getApplication()->getInput()->getInt('id', 0); + + $this->ticket = $model->getTicket($id); + $this->cannedResponses = $model->getCannedResponses((int) ($this->ticket->category_id ?? 0)); + + if (!$this->ticket) + { + Factory::getApplication()->enqueueMessage('Ticket not found.', 'error'); + Factory::getApplication()->redirect('index.php?option=com_mokowaas&view=tickets'); + + return; + } + + $this->addToolbar(); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } + + protected function addToolbar(): void + { + $title = $this->ticket ? 'Ticket #' . $this->ticket->id . ' — ' . $this->ticket->subject : 'Ticket'; + ToolbarHelper::title($title, 'headphones'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas&view=tickets'); + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php new file mode 100644 index 00000000..387d5750 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php @@ -0,0 +1,54 @@ +getModel(); + $app = Factory::getApplication(); + + $filters = [ + 'status' => $app->getInput()->getString('filter_status', ''), + 'priority' => $app->getInput()->getString('filter_priority', ''), + 'category_id' => $app->getInput()->getInt('filter_category', 0), + ]; + + $this->tickets = $model->getTickets($filters); + $this->categories = $model->getCategories(); + $this->statusCounts = $model->getStatusCounts(); + $this->overdue = $model->getOverdueTickets(); + + $this->addToolbar(); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } + + protected function addToolbar(): void + { + ToolbarHelper::title(Text::_('COM_MOKOWAAS_TICKETS_TITLE'), 'headphones'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas'); + } +} diff --git a/src/packages/com_mokowaas/admin/tmpl/ticket/default.php b/src/packages/com_mokowaas/admin/tmpl/ticket/default.php new file mode 100644 index 00000000..e7ceb8ee --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/ticket/default.php @@ -0,0 +1,198 @@ +ticket; +$canned = $this->cannedResponses; +$token = Session::getFormToken(); + +$statusBadge = [ + 'open' => 'bg-primary', 'in_progress' => 'bg-info', + 'waiting' => 'bg-warning text-dark', 'resolved' => 'bg-success', 'closed' => 'bg-secondary', +]; +$priorityBadge = [ + 'low' => 'bg-secondary', 'normal' => 'bg-primary', 'high' => 'bg-warning text-dark', 'urgent' => 'bg-danger', +]; +?> + +
+ +
+ +
+
+
+ escape($t->created_by_name); ?> + created, 'M d, Y H:i'); ?> +
+ Original +
+
escape($t->body)); ?>
+
+ + + replies as $reply): ?> +
+
+
+ escape($reply->user_name ?? 'System'); ?> + created, 'M d, Y H:i'); ?> +
+ is_internal): ?> + Internal Note + +
+
escape($reply->body)); ?>
+
+ + + +
+
Reply
+
+ +
+ +
+ + +
+ + +
+
+
+
+ + +
+
+
Details
+
+ + + + + + + + resolved): ?> + closed): ?> + +
Statusstatus)); ?>
Prioritypriority); ?>
Categoryescape($t->category_title ?? '—'); ?>
Created Byescape($t->created_by_name); ?>
escape($t->created_by_email ?? ''); ?>
Assigned Toescape($t->assigned_to_name ?? 'Unassigned'); ?>
Createdcreated, 'M d, Y H:i'); ?>
Resolvedresolved, 'M d, Y H:i'); ?>
Closedclosed, 'M d, Y H:i'); ?>
Repliesreply_count; ?>
+
+
+ + + sla_response_due || $t->sla_resolution_due): ?> +
+
SLA
+
+ sla_response_due): ?> +
+ Response Due
+ sla_responded && strtotime($t->sla_response_due) < time(); + ?> + + sla_responded ? 'Responded' : HTMLHelper::_('date', $t->sla_response_due, 'M d H:i'); ?> + + +
+ + sla_resolution_due): ?> +
+ Resolution Due
+ status, ['resolved','closed']) && strtotime($t->sla_resolution_due) < time(); + ?> + + status, ['resolved','closed']) ? 'Met' : HTMLHelper::_('date', $t->sla_resolution_due, 'M d H:i'); ?> + + +
+ +
+
+ + + +
+
Actions
+
+ 'Reopen', 'in_progress' => 'In Progress', 'waiting' => 'Waiting', 'resolved' => 'Resolve', 'closed' => 'Close'] as $s => $label): ?> + status): ?> + + + +
+
+
+
+ + diff --git a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php new file mode 100644 index 00000000..f5cfa0f8 --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php @@ -0,0 +1,181 @@ +tickets; +$categories = $this->categories; +$counts = $this->statusCounts; +$overdue = $this->overdue; +$token = Session::getFormToken(); + +$statusBadge = [ + 'open' => 'bg-primary', + 'in_progress' => 'bg-info', + 'waiting' => 'bg-warning text-dark', + 'resolved' => 'bg-success', + 'closed' => 'bg-secondary', +]; + +$priorityBadge = [ + 'low' => 'bg-secondary', + 'normal' => 'bg-primary', + 'high' => 'bg-warning text-dark', + 'urgent' => 'bg-danger', +]; +?> + +
+ +
+
open; ?>Open
+
in_progress; ?>In Progress
+
waiting; ?>Waiting
+
resolved; ?>Resolved
+
closed; ?>Closed
+ 0): ?> +
SLA Overdue
+ +
+ + +
+
+ +
+
+ + + + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + sla_response_due && !$t->sla_responded && strtotime($t->sla_response_due) < $now) $slaClass = 'table-danger'; + elseif ($t->sla_resolution_due && strtotime($t->sla_resolution_due) < $now && !\in_array($t->status, ['resolved','closed'])) $slaClass = 'table-danger'; + elseif ($t->sla_response_due && !$t->sla_responded && strtotime($t->sla_response_due) < $now + 3600) $slaClass = 'table-warning'; + ?> + + + + + + + + + + + + + + +
#SubjectStatusPriorityCategoryCreated ByAssigned ToCreatedSLA
No tickets found.
id; ?>escape(mb_substr($t->subject, 0, 60)); ?>status)); ?>priority); ?>escape($t->category_title ?? '—'); ?>escape($t->created_by_name ?? ''); ?>escape($t->assigned_to_name ?? 'Unassigned'); ?>created, 'M d H:i'); ?> + sla_response_due && !$t->sla_responded): ?> + sla_response_due, 'M d H:i'); ?> + sla_resolution_due): ?> + sla_resolution_due, 'M d H:i'); ?> + — +
+
+
+
+ + + + + diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 83fbe3ca..afbea403 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -30,6 +30,7 @@ COM_MOKOWAAS_MENU_DASHBOARD COM_MOKOWAAS_MENU_EXTENSIONS + COM_MOKOWAAS_MENU_TICKETS COM_MOKOWAAS_MENU_HTACCESS COM_MOKOWAAS_MENU_PLUGINS COM_MOKOWAAS_MENU_UPDATES @@ -39,11 +40,16 @@ language services + sql src tmpl + + admin/sql/install.mysql.sql + + src From 6798a5da7e7daa7600c471208a8a5ec22b3a58d0 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:25:37 +0000 Subject: [PATCH 032/220] chore(version): auto-bump 02.32.31 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index affd44f8..d15590af 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.30 + 02.32.31 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 319cb7ce..8d90bd41 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.30 +# VERSION: 02.32.31 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 35b0e325..ae9805d9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.30 + VERSION: 02.32.31 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c2b42365..2f13de0d 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 2f58c5c6..35abe211 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index ed3df2b9..a60ed9f8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.30 + VERSION: 02.32.31 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 0e4241f2..deb24f3b 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 16f7a364..8e43a320 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.30 +VERSION: 02.32.31 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index d86dfe86..0a7ae59e 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.30) +# MokoWaaS Build Guide (VERSION: 02.32.31) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index e20ffbab..b2fde526 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.30) +# MokoWaaS Configuration Guide (VERSION: 02.32.31) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index c7cbc95e..e95e2a89 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.30) +# MokoWaaS Installation Guide (VERSION: 02.32.31) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 0deec5fa..102737c1 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.30) +# MokoWaaS Operations Guide (VERSION: 02.32.31) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 41bd94bd..6b1b5ac1 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.30) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.31) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 6a874599..294bfc01 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.30) +# MokoWaaS Testing Guide (VERSION: 02.32.31) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 631ccf87..c4cfa12e 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.30) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.31) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index c6ab537d..140f2b46 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.30) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.31) ## Introduction diff --git a/docs/index.md b/docs/index.md index 3d3f38de..d0e28fa3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.30 + VERSION: 02.32.31 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.30) +# MokoWaaS Documentation Index (VERSION: 02.32.31) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 0531656e..28c17cef 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.30 + VERSION: 02.32.31 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.30) +# MokoWaaS Plugin Overview (VERSION: 02.32.31) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 682915f1..43c1a44b 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.30 +VERSION: 02.32.31 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 148f3fea..d7249865 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 47ff686f..ec765557 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 792ba48e..e6bd3b14 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index b9d0d35b..4109555b 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 34c95098..a52b4a52 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index f0e66740..4a0e7ce0 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 95aaa25f..106c4700 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 568a1071..6f769491 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index e86ee064..d62ea8f6 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 2c453f9f..e375c232 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.30 + * VERSION: 02.32.31 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index cc82edee..3b66a927 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.30 + * VERSION: 02.32.31 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index da93885c..57cf4b2d 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.30 + * VERSION: 02.32.31 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 44354e45..5ea2a127 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 60326d09..62325d1a 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index eacff21b..5da7a843 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.30 + * VERSION: 02.32.31 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index e35a7f85..faf1d9cc 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 117bbe0a..cb6c7f53 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 56c425e8..6fdcb63d 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 5df1feee..00e05bf1 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml index 682c698b..02188e4b 100644 --- a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml +++ b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 PLG_SYSTEM_MOKOWAAS_TOS_DESC Moko\Plugin\System\MokoWaaSTos diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 057f45ea..8c651e9d 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 - 02.32.30 + 02.32.31 + 02.32.31 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 596224f4..5e7261e7 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 + 02.32.31 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 470922ba..7167cffb 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 - 02.32.30 + 02.32.31 + 02.32.31 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index cf4e5982..8518e6c2 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.30 - 02.32.30 + 02.32.31 + 02.32.31 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index cbc0689f..cea4f3e6 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.30 + * VERSION: 02.32.31 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index e4f7644c..249954f2 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.30 + * VERSION: 02.32.31 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 812fbe3a..1423488a 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.30 + 02.32.31 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 3c17532b..e054ccc0 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 1ce287cb2e6249e55cea11c88fd8c30e133cb086 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:25:39 +0000 Subject: [PATCH 033/220] chore: update development channel 02.32.31 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index e054ccc0..31a5b27f 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.30-dev + 02.32.31-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.30-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.31-dev.zip - a41c5d16c26c906a33de21bb415a819dc9ed6db9d45d3ca3d99cc8c33eb94d05 + 943b30ab763312c53e78c2debe0ec34661fdd19f84a8bedd023aed8220808d86 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From b50661d9ee1bb20e1c9425bc73de05d7a309d00d Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 15:30:57 -0500 Subject: [PATCH 034/220] feat: component ACL permissions for MokoWaaS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added access.xml with granular permissions: - core.admin / core.manage (Joomla standard) - mokowaas.dashboard — view the control panel - mokowaas.extensions — install/uninstall Moko packages - mokowaas.htaccess — edit .htaccess configuration - mokowaas.tickets — view helpdesk tickets - mokowaas.tickets.create — create new tickets - mokowaas.tickets.assign — assign tickets to users - mokowaas.plugins.toggle — enable/disable feature plugins - mokowaas.cache — clear Joomla cache Configurable per user group in Options > Permissions tab. Also moved MokoWaaS to top of admin sidebar menu. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/com_mokowaas/admin/access.xml | 15 +++++++++++++++ .../admin/language/en-GB/com_mokowaas.ini | 18 ++++++++++++++++++ src/packages/com_mokowaas/mokowaas.xml | 1 + 3 files changed, 34 insertions(+) create mode 100644 src/packages/com_mokowaas/admin/access.xml diff --git a/src/packages/com_mokowaas/admin/access.xml b/src/packages/com_mokowaas/admin/access.xml new file mode 100644 index 00000000..753c1ee1 --- /dev/null +++ b/src/packages/com_mokowaas/admin/access.xml @@ -0,0 +1,15 @@ + + +
+ + + + + + + + + + +
+ diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini index d7713042..f8a00220 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.ini @@ -21,3 +21,21 @@ COM_MOKOWAAS_EXTENSIONS_INFO="Install Moko Consulting Joomla packages from the o COM_MOKOWAAS_EXTENSIONS_LINK="Moko Extensions" COM_MOKOWAAS_HTACCESS_TITLE=".htaccess Maker" COM_MOKOWAAS_TICKETS_TITLE="Helpdesk" + +; ACL +COM_MOKOWAAS_ACL_DASHBOARD="View Dashboard" +COM_MOKOWAAS_ACL_DASHBOARD_DESC="Allow viewing the MokoWaaS control panel dashboard." +COM_MOKOWAAS_ACL_EXTENSIONS="Manage Extensions" +COM_MOKOWAAS_ACL_EXTENSIONS_DESC="Allow installing and uninstalling Moko extensions." +COM_MOKOWAAS_ACL_HTACCESS="Manage .htaccess" +COM_MOKOWAAS_ACL_HTACCESS_DESC="Allow editing and saving the .htaccess configuration." +COM_MOKOWAAS_ACL_TICKETS="View Tickets" +COM_MOKOWAAS_ACL_TICKETS_DESC="Allow viewing helpdesk tickets." +COM_MOKOWAAS_ACL_TICKETS_CREATE="Create Tickets" +COM_MOKOWAAS_ACL_TICKETS_CREATE_DESC="Allow creating new helpdesk tickets." +COM_MOKOWAAS_ACL_TICKETS_ASSIGN="Assign Tickets" +COM_MOKOWAAS_ACL_TICKETS_ASSIGN_DESC="Allow assigning tickets to other users." +COM_MOKOWAAS_ACL_PLUGINS_TOGGLE="Toggle Plugins" +COM_MOKOWAAS_ACL_PLUGINS_TOGGLE_DESC="Allow enabling and disabling MokoWaaS feature plugins." +COM_MOKOWAAS_ACL_CACHE="Clear Cache" +COM_MOKOWAAS_ACL_CACHE_DESC="Allow clearing the Joomla cache from the dashboard." diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 148f3fea..3b5bfb59 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -38,6 +38,7 @@ COM_MOKOWAAS_MENU_CACHE + access.xml language services sql From 4684c4a1ebd8bb295d1c5634b3df4ca8d0870bbb Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:31:13 +0000 Subject: [PATCH 035/220] chore(version): auto-bump 02.32.32 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index d15590af..5834facc 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.31 + 02.32.32 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 8d90bd41..d7ba1cd8 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.31 +# VERSION: 02.32.32 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index ae9805d9..b05d7ccf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.31 + VERSION: 02.32.32 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2f13de0d..66dbe2f3 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 35abe211..7e27f0ea 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index a60ed9f8..e721cd09 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.31 + VERSION: 02.32.32 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index deb24f3b..9ce595f4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 8e43a320..3bb4027a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.31 +VERSION: 02.32.32 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 0a7ae59e..7df4ddb7 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.31) +# MokoWaaS Build Guide (VERSION: 02.32.32) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index b2fde526..78decbca 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.31) +# MokoWaaS Configuration Guide (VERSION: 02.32.32) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index e95e2a89..ed20fba6 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.31) +# MokoWaaS Installation Guide (VERSION: 02.32.32) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 102737c1..b61c252d 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.31) +# MokoWaaS Operations Guide (VERSION: 02.32.32) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 6b1b5ac1..40ae61ff 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.31) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.32) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 294bfc01..e23266cf 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.31) +# MokoWaaS Testing Guide (VERSION: 02.32.32) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index c4cfa12e..d6cc21a2 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.31) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.32) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 140f2b46..1c98f408 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.31) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.32) ## Introduction diff --git a/docs/index.md b/docs/index.md index d0e28fa3..cbfde084 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.31 + VERSION: 02.32.32 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.31) +# MokoWaaS Documentation Index (VERSION: 02.32.32) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 28c17cef..54e0f3ae 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.31 + VERSION: 02.32.32 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.31) +# MokoWaaS Plugin Overview (VERSION: 02.32.32) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 43c1a44b..59bab559 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.31 +VERSION: 02.32.32 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 40433bbb..2b3001d7 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index ec765557..16aa4ce6 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index e6bd3b14..a36066cd 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 4109555b..fae4a6fc 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index a52b4a52..f6c504e7 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 4a0e7ce0..39e05f0f 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 106c4700..01b1890f 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 6f769491..56dbfd89 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index d62ea8f6..39e6cf89 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index e375c232..42f5abb9 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.31 + * VERSION: 02.32.32 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 3b66a927..3dec1fd3 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.31 + * VERSION: 02.32.32 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 57cf4b2d..54165530 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.31 + * VERSION: 02.32.32 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 5ea2a127..28fbb1d0 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 62325d1a..2b46fbbb 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 5da7a843..73881d81 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.31 + * VERSION: 02.32.32 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index faf1d9cc..6fb48a02 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index cb6c7f53..bba0470c 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 6fdcb63d..b305a736 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 00e05bf1..61d7860b 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml index 02188e4b..1cf673c2 100644 --- a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml +++ b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 PLG_SYSTEM_MOKOWAAS_TOS_DESC Moko\Plugin\System\MokoWaaSTos diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 8c651e9d..75c9e929 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 - 02.32.31 + 02.32.32 + 02.32.32 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 5e7261e7..4ea90889 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 + 02.32.32 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 7167cffb..7b65bc11 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 - 02.32.31 + 02.32.32 + 02.32.32 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 8518e6c2..ff038925 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.31 - 02.32.31 + 02.32.32 + 02.32.32 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index cea4f3e6..11d8f39b 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.31 + * VERSION: 02.32.32 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 249954f2..b5000aed 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.31 + * VERSION: 02.32.32 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 1423488a..ffa16076 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.31 + 02.32.32 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 31a5b27f..57446153 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From cf85a560e44dbc64fe8dc1888af8008214b28da5 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:31:15 +0000 Subject: [PATCH 036/220] chore: update development channel 02.32.32 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 57446153..5597df91 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.31-dev + 02.32.32-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.31-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.32-dev.zip - 943b30ab763312c53e78c2debe0ec34661fdd19f84a8bedd023aed8220808d86 + 3f27a5a89763bfca54c53b17a4b9047e61886c34acf2b33a787b6eaad1d751d9 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 33ce8b115c92b89ee1ea737f2071201c30135d9b Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 15:33:33 -0500 Subject: [PATCH 037/220] feat: wire ACL checks into all controller actions and views MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Every view and AJAX task now checks its specific ACL permission: - display() checks VIEW_ACL map per view name - togglePlugin → mokowaas.plugins.toggle - clearCache → mokowaas.cache - installExtension → mokowaas.extensions - saveHtaccess/generateHtaccess → mokowaas.htaccess - createTicket → mokowaas.tickets.create - addTicketReply/updateTicketStatus → mokowaas.tickets Super admins (core.admin) always bypass all checks. Refactored to use checkAcl/jsonResponse/jsonForbidden helpers. Default ACL applied on dev: - Super Users: all permissions - Administrator: cache + ticket assign - Manager: dashboard + tickets (view/create) - Others: no access Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Controller/DisplayController.php | 261 +++++++++--------- 1 file changed, 135 insertions(+), 126 deletions(-) diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index a4f3fc62..c20a314e 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -20,131 +20,113 @@ class DisplayController extends BaseController { protected $default_view = 'dashboard'; + /** + * ACL map: view name => required permission. + */ + private const VIEW_ACL = [ + 'dashboard' => 'mokowaas.dashboard', + 'extensions' => 'mokowaas.extensions', + 'htaccess' => 'mokowaas.htaccess', + 'tickets' => 'mokowaas.tickets', + 'ticket' => 'mokowaas.tickets', + ]; + public function display($cachable = false, $urlparams = []) { + $view = $this->input->get('view', $this->default_view); + $acl = self::VIEW_ACL[$view] ?? 'core.manage'; + + if (!$this->checkAcl($acl)) + { + Factory::getApplication()->enqueueMessage(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 'error'); + Factory::getApplication()->redirect(Route::_('index.php', false)); + + return; + } + return parent::display($cachable, $urlparams); } - /** - * Toggle a MokoWaaS feature plugin on or off. - * - * Expects POST with extension_id and enabled (0 or 1). - * Returns JSON response for AJAX calls. - */ + // ================================================================== + // Plugin toggle + // ================================================================== + public function togglePlugin() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('mokowaas.plugins.toggle')) + { + $this->jsonForbidden(); + } + $app = Factory::getApplication(); - $input = $app->getInput(); + $model = $this->getModel('Dashboard'); - $user = $app->getIdentity(); - if (!$user->authorise('core.manage', 'com_plugins')) - { - $app->setHeader('Content-Type', 'application/json'); - echo json_encode(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]); - $app->close(); - } + $result = $model->togglePlugin( + $app->getInput()->getInt('extension_id', 0), + $app->getInput()->getInt('enabled', 0) + ); - $extensionId = $input->getInt('extension_id', 0); - $enabled = $input->getInt('enabled', 0); - - if (!$extensionId) - { - $app->setHeader('Content-Type', 'application/json'); - echo json_encode(['success' => false, 'message' => 'Missing extension_id']); - $app->close(); - } - - $model = $this->getModel('Dashboard'); - $result = $model->togglePlugin($extensionId, $enabled); - - $app->setHeader('Content-Type', 'application/json'); - echo json_encode($result); - $app->close(); + $this->jsonResponse($result); } - /** - * Clear the Joomla cache. - */ + // ================================================================== + // Cache + // ================================================================== + public function clearCache() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); - $app = Factory::getApplication(); - $user = $app->getIdentity(); - - if (!$user->authorise('core.admin')) + if (!$this->checkAcl('mokowaas.cache')) { - $app->setHeader('Content-Type', 'application/json'); - echo json_encode(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]); - $app->close(); + $this->jsonForbidden(); } - $model = $this->getModel('Dashboard'); - $result = $model->clearCache(); - - $app->setHeader('Content-Type', 'application/json'); - echo json_encode($result); - $app->close(); + $this->jsonResponse($this->getModel('Dashboard')->clearCache()); } - /** - * Install a Moko extension from a download URL. - */ + // ================================================================== + // Extensions + // ================================================================== + public function installExtension() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); - $app = Factory::getApplication(); - $user = $app->getIdentity(); - - if (!$user->authorise('core.admin')) + if (!$this->checkAcl('mokowaas.extensions')) { - $app->setHeader('Content-Type', 'application/json'); - echo json_encode(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]); - $app->close(); + $this->jsonForbidden(); } - $downloadUrl = $app->getInput()->getString('download_url', ''); + $downloadUrl = Factory::getApplication()->getInput()->getString('download_url', ''); if (empty($downloadUrl)) { - $app->setHeader('Content-Type', 'application/json'); - echo json_encode(['success' => false, 'message' => 'Missing download URL.']); - $app->close(); + $this->jsonResponse(['success' => false, 'message' => 'Missing download URL.']); } - $model = $this->getModel('Extensions'); - $result = $model->installFromUrl($downloadUrl); - - $app->setHeader('Content-Type', 'application/json'); - echo json_encode($result); - $app->close(); + $this->jsonResponse($this->getModel('Extensions')->installFromUrl($downloadUrl)); } - /** - * Save .htaccess to disk and persist options. - */ + // ================================================================== + // .htaccess + // ================================================================== + public function saveHtaccess() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); - $app = Factory::getApplication(); - $user = $app->getIdentity(); - - if (!$user->authorise('core.admin')) + if (!$this->checkAcl('mokowaas.htaccess')) { - $app->setHeader('Content-Type', 'application/json'); - echo json_encode(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]); - $app->close(); + $this->jsonForbidden(); } - $input = $app->getInput(); - $content = $input->getRaw('content', ''); - $model = $this->getModel('Htaccess'); + $app = Factory::getApplication(); + $input = $app->getInput(); + $model = $this->getModel('Htaccess'); - // Save options from opt_ prefixed fields $options = []; foreach ($input->getArray() as $key => $value) @@ -160,28 +142,24 @@ class DisplayController extends BaseController $model->saveOptions($options); } - $result = $model->saveHtaccess($content); - - $app->setHeader('Content-Type', 'application/json'); - echo json_encode($result); - $app->close(); + $this->jsonResponse($model->saveHtaccess($input->getRaw('content', ''))); } - /** - * Generate .htaccess preview from posted options (AJAX). - */ public function generateHtaccess() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); - $app = Factory::getApplication(); - $input = $app->getInput(); - $model = $this->getModel('Htaccess'); - $options = $input->getArray(); + if (!$this->checkAcl('mokowaas.htaccess')) + { + $this->jsonForbidden(); + } + + $model = $this->getModel('Htaccess'); + $options = Factory::getApplication()->getInput()->getArray(); - // Save options for persistence $model->saveOptions($options); + $app = Factory::getApplication(); $app->setHeader('Content-Type', 'application/json'); echo json_encode([ 'htaccess' => $model->generateHtaccess($options), @@ -190,69 +168,100 @@ class DisplayController extends BaseController $app->close(); } - /** - * Create a new support ticket. - */ + // ================================================================== + // Tickets + // ================================================================== + public function createTicket() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); - $app = Factory::getApplication(); - $input = $app->getInput(); - $model = $this->getModel('Tickets'); + if (!$this->checkAcl('mokowaas.tickets.create')) + { + $this->jsonForbidden(); + } - $result = $model->createTicket([ + $input = Factory::getApplication()->getInput(); + + $this->jsonResponse($this->getModel('Tickets')->createTicket([ 'subject' => $input->getString('subject', ''), 'body' => $input->getRaw('body', ''), 'priority' => $input->getString('priority', 'normal'), 'category_id' => $input->getInt('category_id', 0), - ]); - - $app->setHeader('Content-Type', 'application/json'); - echo json_encode($result); - $app->close(); + ])); } - /** - * Add a reply to a ticket. - */ public function addTicketReply() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); - $app = Factory::getApplication(); - $input = $app->getInput(); - $model = $this->getModel('Tickets'); + if (!$this->checkAcl('mokowaas.tickets')) + { + $this->jsonForbidden(); + } - $result = $model->addReply( + $input = Factory::getApplication()->getInput(); + + $this->jsonResponse($this->getModel('Tickets')->addReply( $input->getInt('ticket_id', 0), $input->getRaw('body', ''), (bool) $input->getInt('is_internal', 0) - ); - - $app->setHeader('Content-Type', 'application/json'); - echo json_encode($result); - $app->close(); + )); } - /** - * Update ticket status. - */ public function updateTicketStatus() { Session::checkToken() or die(Text::_('JINVALID_TOKEN')); - $app = Factory::getApplication(); - $input = $app->getInput(); - $model = $this->getModel('Tickets'); + if (!$this->checkAcl('mokowaas.tickets')) + { + $this->jsonForbidden(); + } - $result = $model->updateStatus( + $input = Factory::getApplication()->getInput(); + + $this->jsonResponse($this->getModel('Tickets')->updateStatus( $input->getInt('ticket_id', 0), $input->getString('status', '') - ); + )); + } + // ================================================================== + // Helpers + // ================================================================== + + /** + * Check a MokoWaaS ACL permission for the current user. + */ + private function checkAcl(string $action): bool + { + $user = Factory::getApplication()->getIdentity(); + + // Super admins always pass + if ($user->authorise('core.admin', 'com_mokowaas')) + { + return true; + } + + return $user->authorise($action, 'com_mokowaas'); + } + + /** + * Send a JSON response and close. + */ + private function jsonResponse(array $data): void + { + $app = Factory::getApplication(); $app->setHeader('Content-Type', 'application/json'); - echo json_encode($result); + echo json_encode($data); $app->close(); } + + /** + * Send a 403 JSON response and close. + */ + private function jsonForbidden(): void + { + $this->jsonResponse(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]); + } } From 6ae5daffa25336a97f7ec5b77c37226f2ac77190 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:33:48 +0000 Subject: [PATCH 038/220] chore(version): auto-bump 02.32.33 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 5834facc..d3a7e7d6 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.32 + 02.32.33 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index d7ba1cd8..4dbf0bb5 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.32 +# VERSION: 02.32.33 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index b05d7ccf..43f34e9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.32 + VERSION: 02.32.33 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 66dbe2f3..befa814f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 7e27f0ea..83045602 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index e721cd09..1aec51f2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.32 + VERSION: 02.32.33 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 9ce595f4..d08bd8f4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 3bb4027a..81588907 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.32 +VERSION: 02.32.33 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 7df4ddb7..96c04f32 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.32) +# MokoWaaS Build Guide (VERSION: 02.32.33) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 78decbca..09dc36f7 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.32) +# MokoWaaS Configuration Guide (VERSION: 02.32.33) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index ed20fba6..222042ee 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.32) +# MokoWaaS Installation Guide (VERSION: 02.32.33) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index b61c252d..e10d7971 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.32) +# MokoWaaS Operations Guide (VERSION: 02.32.33) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 40ae61ff..04159b7e 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.32) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.33) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index e23266cf..abf41a14 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.32) +# MokoWaaS Testing Guide (VERSION: 02.32.33) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index d6cc21a2..df5dee97 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.32) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.33) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 1c98f408..4c13724f 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.32) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.33) ## Introduction diff --git a/docs/index.md b/docs/index.md index cbfde084..c1d3698a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.32 + VERSION: 02.32.33 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.32) +# MokoWaaS Documentation Index (VERSION: 02.32.33) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 54e0f3ae..4c977819 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.32 + VERSION: 02.32.33 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.32) +# MokoWaaS Plugin Overview (VERSION: 02.32.33) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 59bab559..20a5b6fe 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.32 +VERSION: 02.32.33 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2b3001d7..988f3e4d 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 16aa4ce6..ff6b3d0c 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index a36066cd..01b79ae9 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index fae4a6fc..573f09ca 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index f6c504e7..0adfe813 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 39e05f0f..c73f5ae5 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 01b1890f..ad844649 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 56dbfd89..f1fb3824 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 39e6cf89..a43708fa 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 42f5abb9..c71888cf 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.32 + * VERSION: 02.32.33 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 3dec1fd3..7067879c 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.32 + * VERSION: 02.32.33 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 54165530..2745bd05 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.32 + * VERSION: 02.32.33 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 28fbb1d0..ec16710e 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 2b46fbbb..405d3ccf 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 73881d81..0a4a6662 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.32 + * VERSION: 02.32.33 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 6fb48a02..efd3436f 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index bba0470c..fa25e644 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index b305a736..d387fd2a 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 61d7860b..075c18a5 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml index 1cf673c2..329a5668 100644 --- a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml +++ b/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 PLG_SYSTEM_MOKOWAAS_TOS_DESC Moko\Plugin\System\MokoWaaSTos diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 75c9e929..bfdffe8e 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 - 02.32.32 + 02.32.33 + 02.32.33 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 4ea90889..4c7a9aee 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.33 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 7b65bc11..d79d6c00 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 - 02.32.32 + 02.32.33 + 02.32.33 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index ff038925..ca74748b 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 - 02.32.32 + 02.32.33 + 02.32.33 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 11d8f39b..6398ec99 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.32 + * VERSION: 02.32.33 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index b5000aed..d46f41d3 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.32 + * VERSION: 02.32.33 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index ffa16076..47a06139 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.32 + 02.32.33 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 5597df91..f9357bad 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From bb03cd94d60fc1402cfbec8cb2390db337f8cd75 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:33:50 +0000 Subject: [PATCH 039/220] chore: update development channel 02.32.33 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index f9357bad..a48eb538 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.32-dev + 02.32.33-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.32-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.33-dev.zip - 3f27a5a89763bfca54c53b17a4b9047e61886c34acf2b33a787b6eaad1d751d9 + a337d676828192b56c70354b2bd2017326be8b24e4f7e0cebc76efa45b908614 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From adccf3bd2ad35eaf9b8cbcb83c3857537ee4d012 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 15:39:04 -0500 Subject: [PATCH 040/220] feat: rename mokowaas_tos to mokowaas_offline + auto-migrate from standalone MokoJoomTOS Renamed plugin element from mokowaas_tos to mokowaas_offline to better reflect its purpose (offline bypass, not just TOS). Added migrateStandalonePlugins() to package script: - Detects if standalone mokojoomtos plugin is installed - Copies its params (configured slugs) to mokowaas_offline - Removes old extension record, update sites, and files - Logs the migration Future standalone-to-MokoWaaS migrations can be added to the $migrations array. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/src/Model/DashboardModel.php | 2 +- .../Extension/MokoWaaS.php | 2 +- .../en-GB/plg_system_mokowaas_offline.ini | 13 ++ .../en-GB/plg_system_mokowaas_offline.sys.ini | 3 + .../mokowaas_offline.xml} | 22 ++-- .../services/provider.php | 6 +- .../src/Extension/Tos.php | 4 +- .../src/Field/MenuslugField.php | 6 +- .../en-GB/plg_system_mokowaas_tos.ini | 13 -- .../en-GB/plg_system_mokowaas_tos.sys.ini | 3 - src/pkg_mokowaas.xml | 2 +- src/script.php | 117 +++++++++++++++++- 12 files changed, 153 insertions(+), 40 deletions(-) create mode 100644 src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.ini create mode 100644 src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.sys.ini rename src/packages/{plg_system_mokowaas_tos/mokowaas_tos.xml => plg_system_mokowaas_offline/mokowaas_offline.xml} (61%) rename src/packages/{plg_system_mokowaas_tos => plg_system_mokowaas_offline}/services/provider.php (85%) rename src/packages/{plg_system_mokowaas_tos => plg_system_mokowaas_offline}/src/Extension/Tos.php (96%) rename src/packages/{plg_system_mokowaas_tos => plg_system_mokowaas_offline}/src/Field/MenuslugField.php (91%) delete mode 100644 src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini delete mode 100644 src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini diff --git a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php index fbc9ab57..b8674dc5 100644 --- a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php @@ -45,7 +45,7 @@ class DashboardModel extends BaseDatabaseModel 'protected' => false, 'configure_only' => false, ], - 'mokowaas_tos' => [ + 'mokowaas_offline' => [ 'icon' => 'icon-globe', 'category' => 'security', 'label' => 'Offline Bypass', diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index a36066cd..29dcdc96 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -1411,7 +1411,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $db->quote('mokowaas_firewall'), $db->quote('mokowaas_tenant'), $db->quote('mokowaas_devtools'), - $db->quote('mokowaas_tos'), + $db->quote('mokowaas_offline'), $db->quote('mod_mokowaas_cpanel'), ]; diff --git a/src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.ini b/src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.ini new file mode 100644 index 00000000..65517993 --- /dev/null +++ b/src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.ini @@ -0,0 +1,13 @@ +; MokoWaaS Terms of Service Plugin +; Copyright (C) 2026 Moko Consulting. All rights reserved. +; License: GPL-3.0-or-later + +PLG_SYSTEM_MOKOWAAS_OFFLINE="System - MokoWaaS Offline Bypass" +PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC="Keep selected pages (Terms of Service, Privacy Policy, etc.) accessible when the site is in offline mode." + +PLG_SYSTEM_MOKOWAAS_OFFLINE_FIELDSET_BASIC="Offline-Accessible Pages" +PLG_SYSTEM_MOKOWAAS_OFFLINE_SLUG_LABEL="Menu Items to Keep Online" +PLG_SYSTEM_MOKOWAAS_OFFLINE_SLUG_DESC="Select menu items that remain accessible during offline mode. Hold Ctrl/Cmd for multiple." +PLG_SYSTEM_MOKOWAAS_OFFLINE_CHILDREN_LABEL="Include Child Menu Items" +PLG_SYSTEM_MOKOWAAS_OFFLINE_CHILDREN_DESC="Also allow access to child pages under the selected items." +PLG_SYSTEM_MOKOWAAS_OFFLINE_SEF_WARNING="SEF URLs are disabled - path matching requires SEF. Itemid fallback is active." diff --git a/src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.sys.ini b/src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.sys.ini new file mode 100644 index 00000000..7b6f1ef3 --- /dev/null +++ b/src/packages/plg_system_mokowaas_offline/language/en-GB/plg_system_mokowaas_offline.sys.ini @@ -0,0 +1,3 @@ +; MokoWaaS Terms of Service Plugin - System strings +PLG_SYSTEM_MOKOWAAS_OFFLINE="System - MokoWaaS Offline Bypass" +PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC="Keep selected pages (Terms of Service, Privacy Policy, etc.) accessible when the site is in offline mode." diff --git a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml similarity index 61% rename from src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml rename to src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 1cf673c2..b24656f6 100644 --- a/src/packages/plg_system_mokowaas_tos/mokowaas_tos.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -1,7 +1,7 @@ System - MokoWaaS Offline Bypass - mokowaas_tos + mokowaas_offline Moko Consulting 2026-06-02 Copyright (C) 2026 Moko Consulting. All rights reserved. @@ -9,8 +9,8 @@ hello@mokoconsulting.tech https://mokoconsulting.tech 02.32.32 - PLG_SYSTEM_MOKOWAAS_TOS_DESC - Moko\Plugin\System\MokoWaaSTos + PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC + Moko\Plugin\System\MokoWaaSOffline src @@ -19,21 +19,21 @@ - en-GB/plg_system_mokowaas_tos.ini - en-GB/plg_system_mokowaas_tos.sys.ini + en-GB/plg_system_mokowaas_offline.ini + en-GB/plg_system_mokowaas_offline.sys.ini - -
+ +
diff --git a/src/packages/plg_system_mokowaas_tos/services/provider.php b/src/packages/plg_system_mokowaas_offline/services/provider.php similarity index 85% rename from src/packages/plg_system_mokowaas_tos/services/provider.php rename to src/packages/plg_system_mokowaas_offline/services/provider.php index 8a7f163e..c45e733d 100644 --- a/src/packages/plg_system_mokowaas_tos/services/provider.php +++ b/src/packages/plg_system_mokowaas_offline/services/provider.php @@ -1,7 +1,7 @@ get(DispatcherInterface::class); - $plugin = new Tos($dispatcher, (array) PluginHelper::getPlugin('system', 'mokowaas_tos')); + $plugin = new Tos($dispatcher, (array) PluginHelper::getPlugin('system', 'mokowaas_offline')); $plugin->setApplication(Factory::getApplication()); return $plugin; diff --git a/src/packages/plg_system_mokowaas_tos/src/Extension/Tos.php b/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php similarity index 96% rename from src/packages/plg_system_mokowaas_tos/src/Extension/Tos.php rename to src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php index 8ef01ed0..1ab84cf6 100644 --- a/src/packages/plg_system_mokowaas_tos/src/Extension/Tos.php +++ b/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php @@ -1,12 +1,12 @@ '', - 'text' => Text::_('PLG_SYSTEM_MOKOWAAS_TOS_SEF_WARNING'), + 'text' => Text::_('PLG_SYSTEM_MOKOWAAS_OFFLINE_SEF_WARNING'), 'disabled' => true, ]; } diff --git a/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini b/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini deleted file mode 100644 index 7b75c1e1..00000000 --- a/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.ini +++ /dev/null @@ -1,13 +0,0 @@ -; MokoWaaS Terms of Service Plugin -; Copyright (C) 2026 Moko Consulting. All rights reserved. -; License: GPL-3.0-or-later - -PLG_SYSTEM_MOKOWAAS_TOS="System - MokoWaaS Offline Bypass" -PLG_SYSTEM_MOKOWAAS_TOS_DESC="Keep selected pages (Terms of Service, Privacy Policy, etc.) accessible when the site is in offline mode." - -PLG_SYSTEM_MOKOWAAS_TOS_FIELDSET_BASIC="Offline-Accessible Pages" -PLG_SYSTEM_MOKOWAAS_TOS_SLUG_LABEL="Menu Items to Keep Online" -PLG_SYSTEM_MOKOWAAS_TOS_SLUG_DESC="Select menu items that remain accessible during offline mode. Hold Ctrl/Cmd for multiple." -PLG_SYSTEM_MOKOWAAS_TOS_CHILDREN_LABEL="Include Child Menu Items" -PLG_SYSTEM_MOKOWAAS_TOS_CHILDREN_DESC="Also allow access to child pages under the selected items." -PLG_SYSTEM_MOKOWAAS_TOS_SEF_WARNING="SEF URLs are disabled - path matching requires SEF. Itemid fallback is active." diff --git a/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini b/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini deleted file mode 100644 index cf84d46a..00000000 --- a/src/packages/plg_system_mokowaas_tos/language/en-GB/plg_system_mokowaas_tos.sys.ini +++ /dev/null @@ -1,3 +0,0 @@ -; MokoWaaS Terms of Service Plugin - System strings -PLG_SYSTEM_MOKOWAAS_TOS="System - MokoWaaS Offline Bypass" -PLG_SYSTEM_MOKOWAAS_TOS_DESC="Keep selected pages (Terms of Service, Privacy Policy, etc.) accessible when the site is in offline mode." diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index ffa16076..112dec43 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -17,7 +17,7 @@ plg_system_mokowaas_firewall.zip plg_system_mokowaas_tenant.zip plg_system_mokowaas_devtools.zip - plg_system_mokowaas_tos.zip + plg_system_mokowaas_offline.zip com_mokowaas.zip mod_mokowaas_cpanel.zip plg_webservices_mokowaas.zip diff --git a/src/script.php b/src/script.php index 7bf3d369..c6a598c1 100644 --- a/src/script.php +++ b/src/script.php @@ -37,12 +37,13 @@ class Pkg_MokowaasInstallerScript // Remove legacy and retired extensions $this->cleanupLegacyExtensions(); $this->removeRetiredExtensions(); + $this->migrateStandalonePlugins(); $this->enablePlugin('system', 'mokowaas'); $this->enablePlugin('system', 'mokowaas_firewall'); $this->enablePlugin('system', 'mokowaas_tenant'); $this->enablePlugin('system', 'mokowaas_devtools'); - $this->enablePlugin('system', 'mokowaas_tos'); + $this->enablePlugin('system', 'mokowaas_offline'); $this->enablePlugin('webservices', 'mokowaas'); $this->enablePlugin('task', 'mokowaasdemo'); $this->enablePlugin('task', 'mokowaassync'); @@ -137,6 +138,118 @@ class Pkg_MokowaasInstallerScript * * @since 02.32.00 */ + private function migrateStandalonePlugins(): void + { + // Migrate standalone MokoJoomTOS plugin to MokoWaaS Offline Bypass + $migrations = [ + ['old_element' => 'mokojoomtos', 'old_folder' => 'system', 'new_element' => 'mokowaas_offline', 'new_folder' => 'system'], + ]; + + try + { + $db = Factory::getDbo(); + + foreach ($migrations as $m) + { + // Check if old plugin exists + $query = $db->getQuery(true) + ->select([$db->quoteName('extension_id'), $db->quoteName('params')]) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote($m['old_element'])) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote($m['old_folder'])); + $db->setQuery($query); + $old = $db->loadObject(); + + if (!$old) + { + continue; + } + + $oldParams = $old->params ?? '{}'; + + // Copy params to new plugin (only if new plugin has empty params) + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote($m['new_element'])) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote($m['new_folder'])); + $db->setQuery($query); + $newParams = (string) $db->loadResult(); + + if (empty($newParams) || $newParams === '{}' || $newParams === '[]') + { + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($oldParams)) + ->where($db->quoteName('element') . ' = ' . $db->quote($m['new_element'])) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote($m['new_folder'])) + )->execute(); + + Factory::getApplication()->enqueueMessage( + sprintf('Migrated settings from %s to %s.', $m['old_element'], $m['new_element']), + 'message' + ); + } + + // Unprotect old plugin + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('protected') . ' = 0') + ->where($db->quoteName('extension_id') . ' = ' . (int) $old->extension_id) + )->execute(); + + // Remove old extension record + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__extensions')) + ->where($db->quoteName('extension_id') . ' = ' . (int) $old->extension_id) + )->execute(); + + // Remove old update site entries + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__update_sites_extensions')) + ->where($db->quoteName('extension_id') . ' = ' . (int) $old->extension_id) + )->execute(); + + // Remove old files + $dir = JPATH_PLUGINS . '/' . $m['old_folder'] . '/' . $m['old_element']; + + if (is_dir($dir)) + { + $this->rmdirRecursive($dir); + } + + Factory::getApplication()->enqueueMessage( + sprintf('Removed standalone %s plugin (replaced by %s).', $m['old_element'], $m['new_element']), + 'message' + ); + + Log::add( + sprintf('Migrated %s → %s and removed old plugin', $m['old_element'], $m['new_element']), + Log::INFO, + 'mokowaas' + ); + } + } + catch (\Throwable $e) + { + Log::add('Standalone plugin migration error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + + /** + * Remove extensions that have been retired and merged into core. + * + * @return void + * + * @since 02.32.00 + */ private function removeRetiredExtensions(): void { $retired = [ @@ -290,7 +403,7 @@ class Pkg_MokowaasInstallerScript $db->quote('mokowaas_firewall'), $db->quote('mokowaas_tenant'), $db->quote('mokowaas_devtools'), - $db->quote('mokowaas_tos'), + $db->quote('mokowaas_offline'), $db->quote('com_mokowaas'), $db->quote('mod_mokowaas_cpanel'), $db->quote('mokowaasdemo'), From fe87e9038ad5ee8e82c3b0b030505a6a43174540 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 15:44:32 -0500 Subject: [PATCH 041/220] feat: Akeeba Ticket System importer Auto-detects ATS tables (#__ats_tickets, #__ats_posts, #__ats_cannedreplies) and shows an import button on the helpdesk ticket list with counts. Imports: - Tickets: maps ATS status (O/P/C) to MokoWaaS statuses, priority 1-5 to low/normal/high/urgent, preserves created_by/assigned_to/dates - Posts: first post becomes ticket body, subsequent posts become replies - Canned replies: imported with title and body (HTML stripped) - Skips duplicates on re-import (idempotent) ACL enforced: requires mokowaas.tickets permission. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Controller/DisplayController.php | 16 ++ .../admin/src/Model/TicketsModel.php | 202 ++++++++++++++++++ .../admin/src/View/Tickets/HtmlView.php | 2 + .../admin/tmpl/tickets/default.php | 42 +++- 4 files changed, 256 insertions(+), 6 deletions(-) diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index c20a314e..b0f24588 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -226,6 +226,22 @@ class DisplayController extends BaseController )); } + // ================================================================== + // ATS Import + // ================================================================== + + public function importAts() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + if (!$this->checkAcl('mokowaas.tickets')) + { + $this->jsonForbidden(); + } + + $this->jsonResponse($this->getModel('Tickets')->importFromAts()); + } + // ================================================================== // Helpers // ================================================================== diff --git a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php index c4245d67..8bad035d 100644 --- a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php @@ -350,4 +350,206 @@ class TicketsModel extends BaseDatabaseModel return $db->loadObjectList() ?: []; } + + // ================================================================== + // Akeeba Ticket System Importer + // ================================================================== + + /** + * Check if ATS tables exist and return counts. + */ + public function checkAtsAvailable(): ?object + { + $db = $this->getDatabase(); + + try + { + $db->setQuery('SELECT COUNT(*) FROM #__ats_tickets'); + $tickets = (int) $db->loadResult(); + + $db->setQuery('SELECT COUNT(*) FROM #__ats_posts'); + $posts = (int) $db->loadResult(); + + $db->setQuery('SELECT COUNT(*) FROM #__ats_cannedreplies'); + $canned = (int) $db->loadResult(); + + return (object) ['tickets' => $tickets, 'posts' => $posts, 'canned' => $canned]; + } + catch (\Throwable $e) + { + return null; + } + } + + /** + * Import tickets, replies, and canned responses from Akeeba Ticket System. + */ + public function importFromAts(): array + { + $db = $this->getDatabase(); + $results = ['tickets' => 0, 'replies' => 0, 'canned' => 0, 'errors' => []]; + + try + { + // Status mapping: ATS → MokoWaaS + $statusMap = [ + 'O' => 'open', // Open + 'P' => 'in_progress', // Pending (staff action needed) + 'C' => 'closed', // Closed + ]; + // Numeric statuses 1-99 are custom — map to open + for ($i = 1; $i <= 99; $i++) + { + $statusMap[(string) $i] = 'open'; + } + + // Priority mapping: ATS uses 1-5, we use enum + $priorityMap = [ + 1 => 'low', + 2 => 'low', + 3 => 'normal', + 4 => 'high', + 5 => 'urgent', + ]; + + // Category mapping: ATS uses Joomla categories, map catid to our category + // Default all to General Support (1) — admin can reassign later + $defaultCategory = 1; + + // Import canned replies first + $db->setQuery('SELECT * FROM #__ats_cannedreplies WHERE enabled = 1 ORDER BY ordering'); + $atsCanned = $db->loadObjectList() ?: []; + + foreach ($atsCanned as $c) + { + $exists = $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from('#__mokowaas_ticket_canned') + ->where($db->quoteName('title') . ' = ' . $db->quote($c->title)) + )->loadResult(); + + if ((int) $exists > 0) + { + continue; + } + + $row = (object) [ + 'title' => $c->title, + 'body' => strip_tags($c->reply ?? ''), + 'category_id' => null, + 'ordering' => (int) ($c->ordering ?? 0), + ]; + $db->insertObject('#__mokowaas_ticket_canned', $row, 'id'); + $results['canned']++; + } + + // Import tickets + $db->setQuery('SELECT * FROM #__ats_tickets ORDER BY id'); + $atsTickets = $db->loadObjectList() ?: []; + + $ticketIdMap = []; // ATS id → MokoWaaS id + + foreach ($atsTickets as $t) + { + // Skip if already imported (check by subject + created_by + created) + $exists = $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from('#__mokowaas_tickets') + ->where($db->quoteName('subject') . ' = ' . $db->quote($t->title)) + ->where($db->quoteName('created_by') . ' = ' . (int) $t->created_by) + )->loadResult(); + + if ((int) $exists > 0) + { + continue; + } + + $status = $statusMap[$t->status] ?? 'open'; + $priority = $priorityMap[(int) $t->priority] ?? 'normal'; + + $row = (object) [ + 'subject' => $t->title, + 'body' => '', + 'status' => $status, + 'priority' => $priority, + 'category_id' => $defaultCategory, + 'created_by' => (int) $t->created_by, + 'assigned_to' => (int) $t->assigned_to ?: null, + 'created' => $t->created ?: Factory::getDate()->toSql(), + 'modified' => $t->modified, + 'resolved' => $status === 'closed' ? ($t->modified ?: $t->created) : null, + 'closed' => $status === 'closed' ? ($t->modified ?: $t->created) : null, + 'sla_responded' => 1, + ]; + + $db->insertObject('#__mokowaas_tickets', $row, 'id'); + $ticketIdMap[(int) $t->id] = (int) $row->id; + $results['tickets']++; + } + + // Import posts (replies) + $db->setQuery('SELECT * FROM #__ats_posts ORDER BY id'); + $atsPosts = $db->loadObjectList() ?: []; + + foreach ($atsPosts as $p) + { + $newTicketId = $ticketIdMap[(int) $p->ticket_id] ?? null; + + if (!$newTicketId) + { + continue; + } + + // First post of a ticket is usually the ticket body — update the ticket + if (empty($results['first_post_' . $p->ticket_id])) + { + $results['first_post_' . $p->ticket_id] = true; + $body = strip_tags($p->content_html ?? ''); + $db->setQuery( + $db->getQuery(true) + ->update('#__mokowaas_tickets') + ->set($db->quoteName('body') . ' = ' . $db->quote($body)) + ->where($db->quoteName('id') . ' = ' . $newTicketId) + )->execute(); + + continue; + } + + $row = (object) [ + 'ticket_id' => $newTicketId, + 'user_id' => (int) $p->created_by, + 'body' => strip_tags($p->content_html ?? ''), + 'is_internal' => 0, + 'created' => $p->created ?: Factory::getDate()->toSql(), + ]; + + $db->insertObject('#__mokowaas_ticket_replies', $row, 'id'); + $results['replies']++; + } + + // Clean up temp tracking keys + foreach (array_keys($results) as $k) + { + if (str_starts_with($k, 'first_post_')) + { + unset($results[$k]); + } + } + + return [ + 'success' => true, + 'message' => sprintf( + 'Imported %d tickets, %d replies, %d canned responses from Akeeba Ticket System.', + $results['tickets'], $results['replies'], $results['canned'] + ), + 'counts' => $results, + ]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Import failed: ' . $e->getMessage()]; + } + } } diff --git a/src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php index 387d5750..98cacb97 100644 --- a/src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php +++ b/src/packages/com_mokowaas/admin/src/View/Tickets/HtmlView.php @@ -21,6 +21,7 @@ class HtmlView extends BaseHtmlView protected $categories = []; protected $statusCounts; protected $overdue = []; + protected $atsAvailable = null; public function display($tpl = null) { @@ -37,6 +38,7 @@ class HtmlView extends BaseHtmlView $this->categories = $model->getCategories(); $this->statusCounts = $model->getStatusCounts(); $this->overdue = $model->getOverdueTickets(); + $this->atsAvailable = $model->checkAtsAvailable(); $this->addToolbar(); diff --git a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php index f5cfa0f8..8b3a241e 100644 --- a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php @@ -6,11 +6,12 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; use Joomla\CMS\Session\Session; -$tickets = $this->tickets; -$categories = $this->categories; -$counts = $this->statusCounts; -$overdue = $this->overdue; -$token = Session::getFormToken(); +$tickets = $this->tickets; +$categories = $this->categories; +$counts = $this->statusCounts; +$overdue = $this->overdue; +$atsAvailable = $this->atsAvailable; +$token = Session::getFormToken(); $statusBadge = [ 'open' => 'bg-primary', @@ -43,10 +44,19 @@ $priorityBadge = [
-
+
+ + +
@@ -178,4 +188,24 @@ document.querySelector('#newTicketModal form').addEventListener('submit', functi else { Joomla.renderMessages({error:[d.message]}); } }); }); + +// ATS Import +var atsBtn = document.getElementById('btn-import-ats'); +if (atsBtn) { + atsBtn.addEventListener('click', function() { + var el = this; + if (!confirm('Import ' + el.dataset.tickets + ' tickets and ' + el.dataset.posts + ' posts from Akeeba Ticket System? Duplicates will be skipped.')) return; + el.disabled = true; + el.textContent = ' Importing...'; + var fd = new FormData(); + fd.append(el.dataset.token, '1'); + fetch(el.dataset.url, {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}}) + .then(function(r){return r.json()}) + .then(function(d){ + if (d.success) { Joomla.renderMessages({message:[d.message]}); location.reload(); } + else { Joomla.renderMessages({error:[d.message]}); el.disabled = false; el.textContent = 'Import Failed - Retry'; } + }) + .catch(function(){ Joomla.renderMessages({error:['Network error']}); el.disabled = false; }); + }); +} From cb33aabb0cdff07e68daa78097a1d94916a9e99a Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:47:38 +0000 Subject: [PATCH 042/220] chore(version): auto-bump 02.32.34 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index d3a7e7d6..5237c571 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.33 + 02.32.34 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 4dbf0bb5..3bdc892f 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.33 +# VERSION: 02.32.34 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 43f34e9c..0bb56d88 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.33 + VERSION: 02.32.34 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index befa814f..fefb4829 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 83045602..0082fb45 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 1aec51f2..479fbf98 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.33 + VERSION: 02.32.34 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index d08bd8f4..b17f8f14 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 81588907..3aff4440 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.33 +VERSION: 02.32.34 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 96c04f32..224ae8dd 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.33) +# MokoWaaS Build Guide (VERSION: 02.32.34) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 09dc36f7..b61a09af 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.33) +# MokoWaaS Configuration Guide (VERSION: 02.32.34) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 222042ee..c3b70897 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.33) +# MokoWaaS Installation Guide (VERSION: 02.32.34) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index e10d7971..47a65267 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.33) +# MokoWaaS Operations Guide (VERSION: 02.32.34) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 04159b7e..02b43fcc 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.33) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.34) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index abf41a14..ac69218b 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.33) +# MokoWaaS Testing Guide (VERSION: 02.32.34) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index df5dee97..afc88a00 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.33) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.34) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 4c13724f..be42a00d 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.33) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.34) ## Introduction diff --git a/docs/index.md b/docs/index.md index c1d3698a..ea98f2f9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.33 + VERSION: 02.32.34 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.33) +# MokoWaaS Documentation Index (VERSION: 02.32.34) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 4c977819..def1b26b 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.33 + VERSION: 02.32.34 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.33) +# MokoWaaS Plugin Overview (VERSION: 02.32.34) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 20a5b6fe..46c3a5bd 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.33 +VERSION: 02.32.34 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 988f3e4d..e13f7fe9 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index ff6b3d0c..cba969d5 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index dc028ff0..cc60b08b 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 573f09ca..fe6ff55e 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 0adfe813..96929627 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index c73f5ae5..6ff7563a 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index ad844649..ef837031 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index f1fb3824..8d78537f 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index a43708fa..0d525145 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index c71888cf..19758982 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.33 + * VERSION: 02.32.34 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 7067879c..d01ce795 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.33 + * VERSION: 02.32.34 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 2745bd05..a73e2c3c 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.33 + * VERSION: 02.32.34 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index ec16710e..6a75b9b6 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 405d3ccf..ab386cb0 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 0a4a6662..df6cf99c 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.33 + * VERSION: 02.32.34 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index efd3436f..8ea6bfe9 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index fa25e644..0e4b6532 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index d387fd2a..bd14b21a 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index b24656f6..a5496779 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.32 + 02.32.34 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 075c18a5..936fca9f 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index bfdffe8e..c5b381ad 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 - 02.32.33 + 02.32.34 + 02.32.34 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 4c7a9aee..19c50ea3 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 + 02.32.34 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index d79d6c00..429d14a4 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 - 02.32.33 + 02.32.34 + 02.32.34 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index ca74748b..c19283cb 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.33 - 02.32.33 + 02.32.34 + 02.32.34 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 6398ec99..b0690f01 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.33 + * VERSION: 02.32.34 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index d46f41d3..e53f6c50 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.33 + * VERSION: 02.32.34 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 95416c5a..3a0e1c2c 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.33 + 02.32.34 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index a48eb538..e616274c 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 883e7c72f04156003ca8d65fadb34ae6ed98a20f Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:47:40 +0000 Subject: [PATCH 043/220] chore: update development channel 02.32.34 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index e616274c..cd0d4e95 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.33-dev + 02.32.34-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.33-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.34-dev.zip - a337d676828192b56c70354b2bd2017326be8b24e4f7e0cebc76efa45b908614 + 631e2a56989418caee3d0bfdecad58adbe9a2a466bae5d0d3e06fd00cfd74ec4 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From ed138fdc5750a240a0639870fd3e49acf3842dc8 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 15:51:22 -0500 Subject: [PATCH 044/220] feat: Akeeba Admin Tools + Ticket System importers with auto-disable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New ImportModel with two importers: Admin Tools Importer: - Reads #__admintools_wafconfig → maps WAF shields, admin secret, session timeout, template blocking to firewall plugin params - Reads #__admintools_storage → maps server signature, HSTS, GZip, expires, ETag, www redirect, directory listing to htaccess options - Reads #__admintools_ipblock → merges into firewall IP deny list - Disables com_admintools + all admintools plugins after import Akeeba Ticket System Importer: - Imports tickets with status/priority mapping - First post becomes ticket body, rest become replies - Imports canned replies - Disables com_ats + all ATS plugins after import Dashboard shows blue import banner when Akeeba data is detected. Both importers require core.admin (Super Users only). Idempotent — safe to run multiple times. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Controller/DisplayController.php | 16 +- .../admin/src/Model/ImportModel.php | 617 ++++++++++++++++++ .../admin/src/View/Dashboard/HtmlView.php | 5 + .../admin/tmpl/dashboard/default.php | 24 + .../com_mokowaas/media/js/dashboard.js | 22 + 5 files changed, 682 insertions(+), 2 deletions(-) create mode 100644 src/packages/com_mokowaas/admin/src/Model/ImportModel.php diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index b0f24588..fe5e1a88 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -227,7 +227,7 @@ class DisplayController extends BaseController } // ================================================================== - // ATS Import + // Importers // ================================================================== public function importAts() @@ -239,7 +239,19 @@ class DisplayController extends BaseController $this->jsonForbidden(); } - $this->jsonResponse($this->getModel('Tickets')->importFromAts()); + $this->jsonResponse($this->getModel('Import')->importAts()); + } + + public function importAdminTools() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + if (!$this->checkAcl('core.admin')) + { + $this->jsonForbidden(); + } + + $this->jsonResponse($this->getModel('Import')->importAdminTools()); } // ================================================================== diff --git a/src/packages/com_mokowaas/admin/src/Model/ImportModel.php b/src/packages/com_mokowaas/admin/src/Model/ImportModel.php new file mode 100644 index 00000000..660351a2 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/Model/ImportModel.php @@ -0,0 +1,617 @@ +getDatabase(); + + try + { + $result = (object) [ + 'component' => false, + 'waf_config' => false, + 'storage' => false, + 'ip_blocks' => 0, + ]; + + // Check component + $db->setQuery("SELECT COUNT(*) FROM #__extensions WHERE element = 'com_admintools' AND type = 'component'"); + $result->component = (int) $db->loadResult() > 0; + + // Check WAF config table + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%admintools_wafconfig%')); + + if ($db->loadResult()) + { + $result->waf_config = true; + $db->setQuery('SELECT COUNT(*) FROM #__admintools_wafconfig'); + $result->waf_settings = (int) $db->loadResult(); + } + + // Check storage table + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%admintools_storage%')); + + if ($db->loadResult()) + { + $result->storage = true; + } + + // Check IP blocklist + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%admintools_ipblock%')); + + if ($db->loadResult()) + { + $db->setQuery('SELECT COUNT(*) FROM #__admintools_ipblock'); + $result->ip_blocks = (int) $db->loadResult(); + } + + // Only available if at least one data source exists + if (!$result->component && !$result->waf_config && !$result->storage) + { + return null; + } + + return $result; + } + catch (\Throwable $e) + { + return null; + } + } + + /** + * Import Admin Tools settings into MokoWaaS. + */ + public function importAdminTools(): array + { + $db = $this->getDatabase(); + $results = ['firewall' => 0, 'htaccess' => 0, 'ip_blocks' => 0, 'disabled' => false]; + + try + { + // ============================================================ + // 1. Import WAF Config → Firewall plugin params + // ============================================================ + $wafSettings = $this->readWafConfig($db); + $firewallParams = $this->mapWafToFirewall($wafSettings); + + if (!empty($firewallParams)) + { + $this->mergePluginParams('mokowaas_firewall', 'system', $firewallParams); + $results['firewall'] = \count($firewallParams); + } + + // ============================================================ + // 2. Import htaccess settings → component htaccess options + // ============================================================ + $htaccessSettings = $this->readHtaccessConfig($db); + $htaccessOptions = $this->mapToHtaccess($htaccessSettings, $wafSettings); + + if (!empty($htaccessOptions)) + { + $this->mergeComponentHtaccessOptions($htaccessOptions); + $results['htaccess'] = \count($htaccessOptions); + } + + // ============================================================ + // 3. Import IP blocklist → Firewall IP deny list + // ============================================================ + $ipBlocks = $this->readIpBlocklist($db); + + if (!empty($ipBlocks)) + { + $this->mergeIpBlocklist($ipBlocks); + $results['ip_blocks'] = \count($ipBlocks); + } + + // ============================================================ + // 4. Disable Admin Tools + // ============================================================ + $this->disableAdminTools($db); + $results['disabled'] = true; + + return [ + 'success' => true, + 'message' => \sprintf( + 'Imported %d firewall settings, %d htaccess options, %d blocked IPs from Admin Tools. Admin Tools has been disabled.', + $results['firewall'], $results['htaccess'], $results['ip_blocks'] + ), + 'counts' => $results, + ]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Import failed: ' . $e->getMessage()]; + } + } + + /** + * Read WAF config from #__admintools_wafconfig. + */ + private function readWafConfig($db): array + { + try + { + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%admintools_wafconfig%')); + + if (!$db->loadResult()) + { + return []; + } + + $db->setQuery('SELECT * FROM #__admintools_wafconfig'); + $rows = $db->loadObjectList() ?: []; + + $config = []; + + foreach ($rows as $row) + { + $key = $row->key ?? $row->option ?? ''; + + if (!empty($key)) + { + $config[$key] = $row->value ?? ''; + } + } + + return $config; + } + catch (\Throwable $e) + { + return []; + } + } + + /** + * Read htaccess/server config from #__admintools_storage. + */ + private function readHtaccessConfig($db): array + { + try + { + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%admintools_storage%')); + + if (!$db->loadResult()) + { + return []; + } + + $db->setQuery('SELECT * FROM #__admintools_storage'); + $rows = $db->loadObjectList() ?: []; + + $config = []; + + foreach ($rows as $row) + { + $key = $row->key ?? ''; + + if (!empty($key)) + { + $config[$key] = $row->value ?? ''; + } + } + + return $config; + } + catch (\Throwable $e) + { + return []; + } + } + + /** + * Read IP blocklist from #__admintools_ipblock. + */ + private function readIpBlocklist($db): array + { + try + { + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%admintools_ipblock%')); + + if (!$db->loadResult()) + { + return []; + } + + $db->setQuery('SELECT ip FROM #__admintools_ipblock'); + + return $db->loadColumn() ?: []; + } + catch (\Throwable $e) + { + return []; + } + } + + /** + * Map Admin Tools WAF config to MokoWaaS firewall plugin params. + */ + private function mapWafToFirewall(array $waf): array + { + $params = []; + + // WAF shields + if (isset($waf['sqlishield'])) + { + $params['waf_sqli'] = (int) $waf['sqlishield'] ? 1 : 0; + } + + if (isset($waf['antispam'])) + { + $params['waf_xss'] = (int) $waf['antispam'] ? 1 : 0; + } + + if (isset($waf['muashield'])) + { + $params['waf_mua'] = (int) $waf['muashield'] ? 1 : 0; + } + + if (isset($waf['rfishield'])) + { + $params['waf_rfi'] = (int) $waf['rfishield'] ? 1 : 0; + } + + if (isset($waf['dfishield'])) + { + $params['waf_dfi'] = (int) $waf['dfishield'] ? 1 : 0; + } + + if (isset($waf['uploadshield'])) + { + // Map to our block_direct_php + $params['block_direct_php'] = (int) $waf['uploadshield'] ? 1 : 0; + } + + // Admin secret URL + if (!empty($waf['adminpw'])) + { + $params['admin_secret'] = $waf['adminpw']; + } + + // Block frontend super user login + if (isset($waf['nofesalogin'])) + { + $params['block_frontend_superuser'] = (int) $waf['nofesalogin'] ? 1 : 0; + } + + // Session timeout + if (!empty($waf['sessionshield']) && !empty($waf['session_timeout'])) + { + $params['admin_session_timeout'] = (int) $waf['session_timeout']; + } + + // Template switch blocking + if (isset($waf['tmpl'])) + { + $params['block_template_switch'] = (int) $waf['tmpl'] ? 1 : 0; + } + + // Blocked sensitive files + if (isset($waf['hogfiles'])) + { + $params['block_sensitive_files'] = (int) $waf['hogfiles'] ? 1 : 0; + } + + return $params; + } + + /** + * Map Admin Tools config to MokoWaaS htaccess maker options. + */ + private function mapToHtaccess(array $storage, array $waf): array + { + $opts = []; + + // Server signature + if (isset($waf['serversignature']) || isset($storage['serversignature'])) + { + $opts['disable_server_signature'] = 1; + } + + // Clickjacking + if (isset($waf['clickjacking']) || isset($storage['xframeoptions'])) + { + $opts['prevent_clickjacking'] = 1; + } + + // HSTS + if (!empty($storage['hstsheader']) || !empty($waf['hstsheader'])) + { + $opts['hsts_enabled'] = 1; + + if (!empty($storage['hstsmaxage'])) + { + $opts['hsts_max_age'] = (int) $storage['hstsmaxage']; + } + } + + // GZip + if (isset($storage['gzipcompression'])) + { + $opts['enable_gzip'] = (int) $storage['gzipcompression'] ? 1 : 0; + } + + // Expiration + if (isset($storage['exptime'])) + { + $opts['enable_expires'] = (int) $storage['exptime'] ? 1 : 0; + } + + // ETag + if (isset($storage['etagtype'])) + { + $opts['etag_control'] = ($storage['etagtype'] === 'none') ? 1 : 0; + } + + // Redirect www / non-www + if (!empty($storage['wwwredir'])) + { + $map = ['www' => 'www', 'nowww' => 'non-www']; + $opts['www_redirect'] = $map[$storage['wwwredir']] ?? 'off'; + } + + // Directory listing + if (isset($storage['nodirlisting'])) + { + $opts['disable_directory_listing'] = (int) $storage['nodirlisting'] ? 1 : 0; + } + + // Block PHP in uploads + if (isset($storage['phpuploadexec'])) + { + $opts['block_php_in_uploads'] = (int) $storage['phpuploadexec'] ? 1 : 0; + } + + // Sensitive files + if (isset($storage['hogfiles'])) + { + $opts['block_sensitive_files'] = (int) $storage['hogfiles'] ? 1 : 0; + } + + return $opts; + } + + /** + * Merge params into a plugin's existing params. + */ + private function mergePluginParams(string $element, string $folder, array $newParams): void + { + $db = $this->getDatabase(); + + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote($element)) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote($folder)); + $db->setQuery($query); + $current = new Registry($db->loadResult() ?? '{}'); + + foreach ($newParams as $key => $value) + { + $current->set($key, $value); + } + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($current->toString())) + ->where($db->quoteName('element') . ' = ' . $db->quote($element)) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote($folder)) + )->execute(); + } + + /** + * Merge htaccess options into the component params. + */ + private function mergeComponentHtaccessOptions(array $options): void + { + $db = $this->getDatabase(); + + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')); + $db->setQuery($query); + $params = new Registry($db->loadResult() ?? '{}'); + + $htaccess = (array) json_decode(json_encode($params->get('htaccess', new \stdClass())), true); + + foreach ($options as $key => $value) + { + $htaccess[$key] = $value; + } + + $params->set('htaccess', $htaccess); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($params->toString())) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + )->execute(); + } + + /** + * Merge imported IPs into the firewall IP blocklist. + */ + private function mergeIpBlocklist(array $ips): void + { + $db = $this->getDatabase(); + + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas_firewall')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')); + $db->setQuery($query); + $params = new Registry($db->loadResult() ?? '{}'); + + $blocklist = json_decode($params->get('ip_blocklist', '[]'), true) ?: []; + + $existingIps = array_column($blocklist, 'ip'); + + foreach ($ips as $ip) + { + $ip = trim($ip); + + if (empty($ip) || \in_array($ip, $existingIps, true)) + { + continue; + } + + $blocklist[] = [ + 'ip' => $ip, + 'enabled' => '1', + 'label' => 'Imported from Admin Tools', + ]; + } + + $params->set('ip_blocklist', json_encode($blocklist)); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($params->toString())) + ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas_firewall')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')) + )->execute(); + } + + /** + * Disable Admin Tools component and plugins. + */ + private function disableAdminTools($db): void + { + // Disable component + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('enabled') . ' = 0') + ->where($db->quoteName('element') . ' = ' . $db->quote('com_admintools')) + )->execute(); + + // Disable all Admin Tools plugins + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('enabled') . ' = 0') + ->where($db->quoteName('element') . ' LIKE ' . $db->quote('admintools%')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + )->execute(); + + Log::add('Admin Tools component and plugins disabled after MokoWaaS import', Log::INFO, 'mokowaas'); + } + + // ================================================================== + // Akeeba Ticket System Import + // ================================================================== + + /** + * Check if ATS tables exist. + */ + public function checkAtsAvailable(): ?object + { + $db = $this->getDatabase(); + + try + { + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%ats_tickets%')); + + if (!$db->loadResult()) + { + return null; + } + + $db->setQuery('SELECT COUNT(*) FROM #__ats_tickets'); + $tickets = (int) $db->loadResult(); + + $db->setQuery('SELECT COUNT(*) FROM #__ats_posts'); + $posts = (int) $db->loadResult(); + + return (object) ['tickets' => $tickets, 'posts' => $posts]; + } + catch (\Throwable $e) + { + return null; + } + } + + /** + * Import from Akeeba Ticket System and disable it. + */ + public function importAts(): array + { + // Delegate to TicketsModel for the actual import + $ticketsModel = new TicketsModel(); + $result = $ticketsModel->importFromAts(); + + if (!$result['success']) + { + return $result; + } + + // Disable ATS after successful import + try + { + $db = $this->getDatabase(); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('enabled') . ' = 0') + ->where($db->quoteName('element') . ' = ' . $db->quote('com_ats')) + )->execute(); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('enabled') . ' = 0') + ->where($db->quoteName('element') . ' LIKE ' . $db->quote('ats%')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + )->execute(); + + $result['message'] .= ' Akeeba Ticket System has been disabled.'; + Log::add('Akeeba Ticket System disabled after MokoWaaS import', Log::INFO, 'mokowaas'); + } + catch (\Throwable $e) + { + $result['message'] .= ' Warning: could not disable ATS: ' . $e->getMessage(); + } + + return $result; + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php index 323febf5..8638da95 100644 --- a/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php +++ b/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php @@ -35,6 +35,11 @@ class HtmlView extends BaseHtmlView $this->checkedOutItems = $model->getCheckedOutItems(); $this->wafBlocks = $model->getRecentWafBlocks(5); + // Check for importable Akeeba data + $importModel = $this->getModel('Import'); + $this->adminToolsAvailable = $importModel->checkAdminToolsAvailable(); + $this->atsAvailable = $importModel->checkAtsAvailable(); + $this->addToolbar(); $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); diff --git a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php index 4728a397..4da50048 100644 --- a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php @@ -19,6 +19,8 @@ $siteInfo = $this->siteInfo; $plugins = $this->plugins; $recentLogins = $this->recentLogins; $pendingUpdates = $this->pendingUpdates; +$adminToolsAvail = $this->adminToolsAvailable ?? null; +$atsAvail = $this->atsAvailable ?? null; $checkedOut = $this->checkedOutItems; $wafBlocks = $this->wafBlocks; $token = Session::getFormToken(); @@ -66,6 +68,28 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
+ + +
+ + Akeeba data detected — import into MokoWaaS: + + + + + + +
+ +
diff --git a/src/packages/com_mokowaas/media/js/dashboard.js b/src/packages/com_mokowaas/media/js/dashboard.js index df8433ed..e6aa671c 100644 --- a/src/packages/com_mokowaas/media/js/dashboard.js +++ b/src/packages/com_mokowaas/media/js/dashboard.js @@ -109,4 +109,26 @@ document.addEventListener('DOMContentLoaded', function () { }); }); } + + // Akeeba import buttons + ['btn-import-admintools', 'btn-import-ats-dash'].forEach(function(id) { + var btn = document.getElementById(id); + if (!btn) return; + btn.addEventListener('click', function() { + var el = this; + if (!confirm('Import Akeeba data into MokoWaaS? Akeeba extensions will be disabled after import.')) return; + el.disabled = true; + var origText = el.textContent; + el.textContent = ' Importing...'; + var fd = new FormData(); + fd.append(el.dataset.token, '1'); + fetch(el.dataset.url, {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}}) + .then(function(r){return r.json()}) + .then(function(d){ + if (d.success) { Joomla.renderMessages({message:[d.message]}); setTimeout(function(){location.reload()}, 2000); } + else { Joomla.renderMessages({error:[d.message]}); el.disabled = false; el.textContent = origText; } + }) + .catch(function(){ Joomla.renderMessages({error:['Network error']}); el.disabled = false; el.textContent = origText; }); + }); + }); }); From 23d6a1ad44edb35712b132846951f09f47ef2ab0 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:51:45 +0000 Subject: [PATCH 045/220] chore(version): auto-bump 02.32.35 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 5237c571..2572b83b 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.34 + 02.32.35 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 3bdc892f..cb6bbaba 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.34 +# VERSION: 02.32.35 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bb56d88..b9c76fb2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.34 + VERSION: 02.32.35 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index fefb4829..cae67402 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 0082fb45..37185d1c 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 479fbf98..15e4be4c 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.34 + VERSION: 02.32.35 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index b17f8f14..e3e2e3d7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 3aff4440..b4ffecc0 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.34 +VERSION: 02.32.35 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 224ae8dd..cc0002ff 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.34) +# MokoWaaS Build Guide (VERSION: 02.32.35) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index b61a09af..07c03445 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.34) +# MokoWaaS Configuration Guide (VERSION: 02.32.35) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index c3b70897..e7dbaaee 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.34) +# MokoWaaS Installation Guide (VERSION: 02.32.35) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 47a65267..8243c0fa 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.34) +# MokoWaaS Operations Guide (VERSION: 02.32.35) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 02b43fcc..954545ab 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.34) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.35) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index ac69218b..1152078d 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.34) +# MokoWaaS Testing Guide (VERSION: 02.32.35) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index afc88a00..25902a89 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.34) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.35) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index be42a00d..fe439e9c 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.34) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.35) ## Introduction diff --git a/docs/index.md b/docs/index.md index ea98f2f9..83dea726 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.34 + VERSION: 02.32.35 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.34) +# MokoWaaS Documentation Index (VERSION: 02.32.35) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index def1b26b..784df7d7 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.34 + VERSION: 02.32.35 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.34) +# MokoWaaS Plugin Overview (VERSION: 02.32.35) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 46c3a5bd..083c0784 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.34 +VERSION: 02.32.35 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index e13f7fe9..7ced6b5c 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index cba969d5..112c94ab 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index cc60b08b..73785e8a 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index fe6ff55e..dcc2e192 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 96929627..aabbf7da 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 6ff7563a..cdeb1db5 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index ef837031..9265a9b2 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 8d78537f..a1da1121 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 0d525145..36814c14 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 19758982..8f3ff5f8 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.34 + * VERSION: 02.32.35 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index d01ce795..a583d777 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.34 + * VERSION: 02.32.35 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index a73e2c3c..f4b62efc 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.34 + * VERSION: 02.32.35 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 6a75b9b6..a42360a2 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index ab386cb0..69e2247d 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index df6cf99c..cc943fb5 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.34 + * VERSION: 02.32.35 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 8ea6bfe9..85a62e4b 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 0e4b6532..79de3774 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index bd14b21a..25e18837 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index a5496779..ebf38326 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 936fca9f..74a5c23c 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index c5b381ad..2b012e12 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 - 02.32.34 + 02.32.35 + 02.32.35 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 19c50ea3..c8fbe7b5 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 + 02.32.35 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 429d14a4..edb05252 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 - 02.32.34 + 02.32.35 + 02.32.35 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index c19283cb..1486d32a 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.34 - 02.32.34 + 02.32.35 + 02.32.35 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index b0690f01..a50ba24c 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.34 + * VERSION: 02.32.35 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index e53f6c50..9b0f543d 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.34 + * VERSION: 02.32.35 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 3a0e1c2c..f7b6e626 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.34 + 02.32.35 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index cd0d4e95..1407ffce 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From eab0ed1b807923338b4d824126a16dea4e98ee5d Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 20:51:48 +0000 Subject: [PATCH 046/220] chore: update development channel 02.32.35 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 1407ffce..e2d46625 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.34-dev + 02.32.35-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.34-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.35-dev.zip - 631e2a56989418caee3d0bfdecad58adbe9a2a466bae5d0d3e06fd00cfd74ec4 + 6dc0bc62259de6bd62963a7d663e2aa80d5c0a69a1fd430f5a4a489f794afe34 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From a2091b1a672825c4b206c8a20490845acb51f59a Mon Sep 17 00:00:00 2001 From: Moko Consulting Date: Tue, 2 Jun 2026 21:33:04 +0000 Subject: [PATCH 047/220] chore(ci): sync CI issue reporter from Template-Joomla --- .mokogitea/workflows/repo-health.yml | 1586 +++++++++++++------------- 1 file changed, 817 insertions(+), 769 deletions(-) diff --git a/.mokogitea/workflows/repo-health.yml b/.mokogitea/workflows/repo-health.yml index b619d894..b23d971e 100644 --- a/.mokogitea/workflows/repo-health.yml +++ b/.mokogitea/workflows/repo-health.yml @@ -1,769 +1,817 @@ -# ============================================================================ -# Copyright (C) 2025 Moko Consulting -# -# This file is part of a Moko Consulting project. -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# FILE INFORMATION -# DEFGROUP: Gitea.Workflow -# INGROUP: moko-platform.Validation -# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform -# PATH: /templates/workflows/joomla/repo_health.yml.template -# VERSION: 09.23.00 -# BRIEF: Enforces repository guardrails by validating release configuration, scripts governance, tooling availability, and core repository health artifacts. -# ============================================================================ - -name: "Generic: Repo Health" - -defaults: - run: - shell: bash - -on: - workflow_dispatch: - inputs: - profile: - description: 'Validation profile: all, release, scripts, or repo' - required: true - default: all - type: choice - options: - - all - - release - - scripts - - repo - pull_request: - push: - -permissions: - contents: read - -env: - # Release policy - Repository Variables Only - RELEASE_REQUIRED_REPO_VARS: RS_FTP_PATH_SUFFIX - RELEASE_OPTIONAL_REPO_VARS: DEV_FTP_SUFFIX - - # Scripts governance policy - SCRIPTS_REQUIRED_DIRS: - SCRIPTS_ALLOWED_DIRS: scripts,scripts/fix,scripts/lib,scripts/release,scripts/run,scripts/validate - - # Repo health policy - REPO_REQUIRED_ARTIFACTS: README.md,LICENSE,CHANGELOG.md,CONTRIBUTING.md,CODE_OF_CONDUCT.md,.mokogitea/workflows/ - REPO_OPTIONAL_FILES: SECURITY.md,GOVERNANCE.md,.editorconfig,.gitattributes,.gitignore,README.md,docs/ - REPO_DISALLOWED_DIRS: - REPO_DISALLOWED_FILES: TODO.md,todo.md - - # Extended checks toggles - EXTENDED_CHECKS: "true" - - # File / directory variables - DOCS_INDEX: docs/docs-index.md - SCRIPT_DIR: scripts - WORKFLOWS_DIR: .mokogitea/workflows - SHELLCHECK_PATTERN: '*.sh' - SPDX_FILE_GLOBS: '*.sh,*.php,*.js,*.ts,*.css,*.xml,*.yml,*.yaml' - FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true - -jobs: - access_check: - name: Access control - runs-on: ubuntu-latest - timeout-minutes: 10 - permissions: - contents: read - - outputs: - allowed: ${{ steps.perm.outputs.allowed }} - permission: ${{ steps.perm.outputs.permission }} - - steps: - - name: Check actor permission (admin only) - id: perm - env: - TOKEN: ${{ secrets.MOKOGITEA_TOKEN || secrets.MOKOGITEA_TOKEN || github.token }} - REPO: ${{ github.repository }} - ACTOR: ${{ github.actor }} - run: | - set -euo pipefail - ALLOWED=false - PERMISSION=unknown - METHOD="" - - # Hardcoded authorized users — always allowed - case "$ACTOR" in - jmiller|gitea-actions[bot]) - ALLOWED=true - PERMISSION=admin - METHOD="hardcoded allowlist" - ;; - *) - # Detect platform and check permissions via API - API_BASE="${GITHUB_API_URL:-${GITEA_API_URL:-https://api.github.com}}" - RESP=$(curl -sf -H "Authorization: token ${TOKEN}" \ - "${API_BASE}/repos/${REPO}/collaborators/${ACTOR}/permission" 2>/dev/null || echo '{}') - PERMISSION=$(echo "$RESP" | grep -oP '"permission"\s*:\s*"\K[^"]+' || echo "unknown") - if [ "$PERMISSION" = "admin" ] || [ "$PERMISSION" = "maintain" ] || [ "$PERMISSION" = "owner" ]; then - ALLOWED=true - fi - METHOD="collaborator API" - ;; - esac - - echo "permission=${PERMISSION}" >> "$GITHUB_OUTPUT" - echo "allowed=${ALLOWED}" >> "$GITHUB_OUTPUT" - - { - echo "## Access Authorization" - echo "" - echo "| Field | Value |" - echo "|-------|-------|" - echo "| **Actor** | \`${ACTOR}\` |" - echo "| **Repository** | \`${REPO}\` |" - echo "| **Permission** | \`${PERMISSION}\` |" - echo "| **Method** | ${METHOD} |" - echo "| **Authorized** | ${ALLOWED} |" - echo "" - if [ "$ALLOWED" = "true" ]; then - echo "${ACTOR} authorized (${METHOD})" - else - echo "${ACTOR} is NOT authorized. Requires admin or maintain role." - fi - } >> "${GITHUB_STEP_SUMMARY}" - - - name: Deny execution when not permitted - if: ${{ steps.perm.outputs.allowed != 'true' }} - run: | - set -euo pipefail - printf '%s\n' 'ERROR: Access denied. Admin permission required.' >> "${GITHUB_STEP_SUMMARY}" - exit 1 - - release_config: - name: Release configuration - needs: access_check - if: ${{ needs.access_check.outputs.allowed == 'true' }} - runs-on: ubuntu-latest - timeout-minutes: 20 - permissions: - contents: read - - steps: - - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - with: - fetch-depth: 0 - - - name: Guardrails release vars - env: - PROFILE_RAW: ${{ github.event.inputs.profile }} - RS_FTP_PATH_SUFFIX: ${{ vars.RS_FTP_PATH_SUFFIX }} - DEV_FTP_SUFFIX: ${{ vars.DEV_FTP_SUFFIX }} - run: | - set -euo pipefail - - profile="${PROFILE_RAW:-all}" - case "${profile}" in - all|release|scripts|repo) ;; - *) - printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" - exit 1 - ;; - esac - - if [ "${profile}" = 'scripts' ] || [ "${profile}" = 'repo' ]; then - { - printf '%s\n' '### Release configuration (Repository Variables)' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' 'Status: SKIPPED' - printf '%s\n' 'Reason: profile excludes release validation' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - exit 0 - fi - - IFS=',' read -r -a required <<< "${RELEASE_REQUIRED_REPO_VARS}" - IFS=',' read -r -a optional <<< "${RELEASE_OPTIONAL_REPO_VARS}" - - missing=() - missing_optional=() - - for k in "${required[@]}"; do - v="${!k:-}" - [ -z "${v}" ] && missing+=("${k}") - done - - for k in "${optional[@]}"; do - v="${!k:-}" - [ -z "${v}" ] && missing_optional+=("${k}") - done - - { - printf '%s\n' '### Release configuration (Repository Variables)' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' '| Variable | Status |' - printf '%s\n' '|---|---|' - printf '%s\n' "| RS_FTP_PATH_SUFFIX | ${RS_FTP_PATH_SUFFIX:-NOT SET} |" - printf '%s\n' "| DEV_FTP_SUFFIX | ${DEV_FTP_SUFFIX:-NOT SET} |" - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - - if [ "${#missing_optional[@]}" -gt 0 ]; then - { - printf '%s\n' '### Missing optional repository variables' - for m in "${missing_optional[@]}"; do printf '%s\n' "- ${m}"; done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - - if [ "${#missing[@]}" -gt 0 ]; then - { - printf '%s\n' '### Missing required repository variables' - for m in "${missing[@]}"; do printf '%s\n' "- ${m}"; done - printf '%s\n' 'ERROR: Guardrails failed. Missing required repository variables.' - } >> "${GITHUB_STEP_SUMMARY}" - exit 1 - fi - - { - printf '%s\n' '### Repository variables validation result' - printf '%s\n' 'Status: OK' - printf '%s\n' 'All required repository variables present.' - printf '%s\n' '' - printf '%s\n' '**Note**: Organization secrets (RS_FTP_HOST, RS_FTP_USER, etc.) are validated at deployment time, not in repository health checks.' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - - scripts_governance: - name: Scripts governance - needs: access_check - if: ${{ needs.access_check.outputs.allowed == 'true' }} - runs-on: ubuntu-latest - timeout-minutes: 15 - permissions: - contents: read - - steps: - - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - with: - fetch-depth: 0 - - - name: Scripts folder checks - env: - PROFILE_RAW: ${{ github.event.inputs.profile }} - run: | - set -euo pipefail - - profile="${PROFILE_RAW:-all}" - case "${profile}" in - all|release|scripts|repo) ;; - *) - printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" - exit 1 - ;; - esac - - if [ "${profile}" = 'release' ] || [ "${profile}" = 'repo' ]; then - { - printf '%s\n' '### Scripts governance' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' 'Status: SKIPPED' - printf '%s\n' 'Reason: profile excludes scripts governance' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - exit 0 - fi - - if [ ! -d "${SCRIPT_DIR}" ]; then - { - printf '%s\n' '### Scripts governance' - printf '%s\n' 'Status: OK (advisory)' - printf '%s\n' 'scripts/ directory not present. No scripts governance enforced.' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - exit 0 - fi - - if [ -n "${SCRIPTS_REQUIRED_DIRS:-}" ]; then IFS=',' read -r -a required_dirs <<< "${SCRIPTS_REQUIRED_DIRS}"; else required_dirs=(); fi - IFS=',' read -r -a allowed_dirs <<< "${SCRIPTS_ALLOWED_DIRS}" - - missing_dirs=() - unapproved_dirs=() - - for d in "${required_dirs[@]}"; do - req="${d%/}" - [ ! -d "${req}" ] && missing_dirs+=("${req}/") - done - - while IFS= read -r d; do - allowed=false - for a in "${allowed_dirs[@]}"; do - a_norm="${a%/}" - [ "${d%/}" = "${a_norm}" ] && allowed=true - done - [ "${allowed}" = false ] && unapproved_dirs+=("${d%/}/") - done < <(find "${SCRIPT_DIR}" -maxdepth 1 -mindepth 1 -type d 2>/dev/null | sed 's#^\./##') - - { - printf '%s\n' '### Scripts governance' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' '| Area | Status | Notes |' - printf '%s\n' '|---|---|---|' - - if [ "${#missing_dirs[@]}" -gt 0 ]; then - printf '%s\n' '| Required directories | Warning | Missing required subfolders |' - else - printf '%s\n' '| Required directories | OK | All required subfolders present |' - fi - - if [ "${#unapproved_dirs[@]}" -gt 0 ]; then - printf '%s\n' '| Directory policy | Warning | Unapproved directories detected |' - else - printf '%s\n' '| Directory policy | OK | No unapproved directories |' - fi - - printf '%s\n' '| Enforcement mode | Advisory | scripts folder is optional |' - printf '\n' - - if [ "${#missing_dirs[@]}" -gt 0 ]; then - printf '%s\n' 'Missing required script directories:' - for m in "${missing_dirs[@]}"; do printf '%s\n' "- ${m}"; done - printf '\n' - else - printf '%s\n' 'Missing required script directories: none.' - printf '\n' - fi - - if [ "${#unapproved_dirs[@]}" -gt 0 ]; then - printf '%s\n' 'Unapproved script directories detected:' - for m in "${unapproved_dirs[@]}"; do printf '%s\n' "- ${m}"; done - printf '\n' - else - printf '%s\n' 'Unapproved script directories detected: none.' - printf '\n' - fi - - printf '%s\n' 'Scripts governance completed in advisory mode.' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - - repo_health: - name: Repository health - needs: access_check - if: ${{ needs.access_check.outputs.allowed == 'true' }} - runs-on: ubuntu-latest - timeout-minutes: 20 - permissions: - contents: read - - steps: - - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - with: - fetch-depth: 0 - - - name: Repository health checks - env: - PROFILE_RAW: ${{ github.event.inputs.profile }} - run: | - set -euo pipefail - - profile="${PROFILE_RAW:-all}" - case "${profile}" in - all|release|scripts|repo) ;; - *) - printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" - exit 1 - ;; - esac - - if [ "${profile}" = 'release' ] || [ "${profile}" = 'scripts' ]; then - { - printf '%s\n' '### Repository health' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' 'Status: SKIPPED' - printf '%s\n' 'Reason: profile excludes repository health' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - exit 0 - fi - - IFS=',' read -r -a required_artifacts <<< "${REPO_REQUIRED_ARTIFACTS}" - IFS=',' read -r -a optional_files <<< "${REPO_OPTIONAL_FILES}" - if [ -n "${REPO_DISALLOWED_DIRS:-}" ]; then IFS=',' read -r -a disallowed_dirs <<< "${REPO_DISALLOWED_DIRS}"; else disallowed_dirs=(); fi - IFS=',' read -r -a disallowed_files <<< "${REPO_DISALLOWED_FILES:-}" - - missing_required=() - missing_optional=() - - # Source directory: src/ or htdocs/ (either is valid for extension repos) - SOURCE_DIR="" - if [ -d "src" ]; then - SOURCE_DIR="src" - elif [ -d "htdocs" ]; then - SOURCE_DIR="htdocs" - elif [ -d "deploy" ] || [ -d "cli" ] || [ -d "monitoring" ]; then - # Platform/tooling repos don't need src/ - SOURCE_DIR="" - else - missing_required+=("src/ or htdocs/ (source directory required)") - fi - - for item in "${required_artifacts[@]}"; do - if printf '%s' "${item}" | grep -q '/$'; then - d="${item%/}" - [ ! -d "${d}" ] && missing_required+=("${item}") - else - [ ! -f "${item}" ] && missing_required+=("${item}") - fi - done - - for f in "${optional_files[@]}"; do - if printf '%s' "${f}" | grep -q '/$'; then - d="${f%/}" - [ ! -d "${d}" ] && missing_optional+=("${f}") - else - [ ! -f "${f}" ] && missing_optional+=("${f}") - fi - done - - for d in "${disallowed_dirs[@]}"; do - d_norm="${d%/}" - [ -d "${d_norm}" ] && missing_required+=("${d_norm}/ (disallowed)") - done - - for f in "${disallowed_files[@]}"; do - [ -f "${f}" ] && missing_required+=("${f} (disallowed)") - done - - git fetch origin --prune - - dev_paths=() - dev_branches=() - - while IFS= read -r b; do - name="${b#origin/}" - if [ "${name}" = 'dev' ]; then - dev_branches+=("${name}") - else - dev_paths+=("${name}") - fi - done < <(git branch -r --list 'origin/dev*' | sed 's/^ *//') - - if [ "${#dev_paths[@]}" -eq 0 ] && [ "${#dev_branches[@]}" -eq 0 ]; then - missing_required+=("dev or dev/* branch") - fi - - content_warnings=() - - if [ -f 'CHANGELOG.md' ] && ! grep -Eq '^# Changelog' CHANGELOG.md; then - content_warnings+=("CHANGELOG.md missing '# Changelog' header") - fi - - if [ -f 'CHANGELOG.md' ] && grep -Eq '^[# ]*Unreleased' CHANGELOG.md; then - content_warnings+=("CHANGELOG.md contains Unreleased section (review release readiness)") - fi - - if [ -f 'LICENSE' ] && ! grep -qiE 'GNU GENERAL PUBLIC LICENSE|GPL' LICENSE; then - content_warnings+=("LICENSE does not look like a GPL text") - fi - - if [ -f 'README.md' ] && ! grep -qiE 'moko|Moko' README.md; then - content_warnings+=("README.md missing expected brand keyword") - fi - - export PROFILE_RAW="${profile}" - export MISSING_REQUIRED="$(printf '%s\n' "${missing_required[@]:-}")" - export MISSING_OPTIONAL="$(printf '%s\n' "${missing_optional[@]:-}")" - export CONTENT_WARNINGS="$(printf '%s\n' "${content_warnings[@]:-}")" - - report_json=$(printf '{"profile":"%s","missing_required":%d,"missing_optional":%d,"content_warnings":%d}' "$profile" "${#missing_required[@]}" "${#missing_optional[@]}" "${#content_warnings[@]}") - - { - printf '%s\n' '### Repository health' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' '| Metric | Value |' - printf '%s\n' '|---|---|' - printf '%s\n' "| Missing required | ${#missing_required[@]} |" - printf '%s\n' "| Missing optional | ${#missing_optional[@]} |" - printf '%s\n' "| Content warnings | ${#content_warnings[@]} |" - printf '\n' - - printf '%s\n' '### Guardrails report (JSON)' - printf '%s\n' '```json' - printf '%s\n' "${report_json}" - printf '%s\n' '```' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - - if [ "${#missing_required[@]}" -gt 0 ]; then - { - printf '%s\n' '### Missing required repo artifacts' - for m in "${missing_required[@]}"; do printf '%s\n' "- ${m}"; done - printf '%s\n' 'ERROR: Guardrails failed. Missing required repository artifacts.' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - exit 1 - fi - - if [ "${#missing_optional[@]}" -gt 0 ]; then - { - printf '%s\n' '### Missing optional repo artifacts' - for m in "${missing_optional[@]}"; do printf '%s\n' "- ${m}"; done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - - if [ "${#content_warnings[@]}" -gt 0 ]; then - { - printf '%s\n' '### Repo content warnings' - for m in "${content_warnings[@]}"; do printf '%s\n' "- ${m}"; done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - - # -- Joomla-specific checks -- - joomla_findings=() - - MANIFEST="$(find . -maxdepth 2 -name '*.xml' -exec grep -l '/dev/null | head -1 || true)" - if [ -z "${MANIFEST}" ]; then - joomla_findings+=("Joomla XML manifest not found (no *.xml with tag)") - else - if ! grep -qP '' "${MANIFEST}"; then - joomla_findings+=("XML manifest: tag missing") - fi - if ! grep -qP 'type="(component|module|plugin|library|package|template|language)"' "${MANIFEST}"; then - joomla_findings+=("XML manifest: type attribute missing or invalid") - fi - if ! grep -qP '' "${MANIFEST}"; then - joomla_findings+=("XML manifest: tag missing") - fi - if ! grep -qP '' "${MANIFEST}"; then - joomla_findings+=("XML manifest: tag missing") - fi - if ! grep -qP ' missing (required for Joomla 5+)") - fi - fi - - INI_COUNT="$(find . -name '*.ini' -type f 2>/dev/null | wc -l)" - if [ "${INI_COUNT}" -eq 0 ]; then - joomla_findings+=("No .ini language files found") - fi - - if [ ! -f 'updates.xml' ]; then - joomla_findings+=("updates.xml missing in root (required for Joomla update server)") - fi - - if [ -n "${SOURCE_DIR}" ]; then - INDEX_DIRS=("${SOURCE_DIR}" "${SOURCE_DIR}/admin" "${SOURCE_DIR}/site") - for dir in "${INDEX_DIRS[@]}"; do - if [ -d "${dir}" ] && [ ! -f "${dir}/index.html" ]; then - joomla_findings+=("${dir}/index.html missing (directory listing protection)") - fi - done - fi - - if [ "${#joomla_findings[@]}" -gt 0 ]; then - { - printf '%s\n' '### Joomla extension checks' - printf '%s\n' '| Check | Status |' - printf '%s\n' '|---|---|' - for f in "${joomla_findings[@]}"; do - printf '%s\n' "| ${f} | Warning |" - done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - else - { - printf '%s\n' '### Joomla extension checks' - printf '%s\n' 'All Joomla-specific checks passed.' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - - extended_enabled="${EXTENDED_CHECKS:-true}" - extended_findings=() - - if [ "${extended_enabled}" = 'true' ]; then - if [ -f '.github/CODEOWNERS' ] || [ -f 'CODEOWNERS' ] || [ -f 'docs/CODEOWNERS' ]; then - : - else - extended_findings+=("CODEOWNERS not found (.github/CODEOWNERS preferred)") - fi - - if ls "${WORKFLOWS_DIR}"/*.yml >/dev/null 2>&1 || ls "${WORKFLOWS_DIR}"/*.yaml >/dev/null 2>&1; then - bad_refs="$(grep -RIn --include='*.yml' --include='*.yaml' -E '^[[:space:]]*uses:[[:space:]]*[^#]+@(main|master)\b' "${WORKFLOWS_DIR}" 2>/dev/null || true)" - if [ -n "${bad_refs}" ]; then - extended_findings+=("Workflows reference actions @main/@master (pin versions): see log excerpt") - { - printf '%s\n' '### Workflow pinning advisory' - printf '%s\n' 'Found uses: entries pinned to main/master:' - printf '%s\n' '```' - printf '%s\n' "${bad_refs}" - printf '%s\n' '```' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - fi - - if [ -f "${DOCS_INDEX}" ]; then - missing_links="" - while IFS= read -r docline; do - for link in $(echo "$docline" | grep -oE '\]\([^)]+\)' | sed 's/\](//' | sed 's/)$//' || true); do - case "$link" in http://*|https://*|"#"*|mailto:*) continue ;; esac - linkpath="${link%%#*}" - linkpath="${linkpath%%\?*}" - [ -z "$linkpath" ] && continue - if [ "${linkpath:0:1}" = "/" ]; then - testpath="${linkpath#/}" - else - testpath="$(dirname "${DOCS_INDEX}")/${linkpath}" - fi - [ ! -e "$testpath" ] && missing_links="${missing_links}${testpath} " - done - done < "${DOCS_INDEX}" - if [ -n "${missing_links}" ]; then - extended_findings+=("docs/docs-index.md contains broken relative links") - { - printf '%s\n' '### Docs index link integrity' - printf '%s\n' 'Broken relative links:' - for bl in ${missing_links}; do - printf '%s\n' "- ${bl}" - done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - fi - - if [ -d "${SCRIPT_DIR}" ]; then - if ! command -v shellcheck >/dev/null 2>&1; then - sudo apt-get update -qq - sudo apt-get install -y shellcheck >/dev/null - fi - - sc_out='' - while IFS= read -r shf; do - [ -z "${shf}" ] && continue - out_one="$(shellcheck -S warning -x "${shf}" 2>/dev/null || true)" - if [ -n "${out_one}" ]; then - sc_out="${sc_out}${out_one}\n" - fi - done < <(find "${SCRIPT_DIR}" -type f -name "${SHELLCHECK_PATTERN}" 2>/dev/null | sort) - - if [ -n "${sc_out}" ]; then - extended_findings+=("ShellCheck warnings detected (advisory)") - sc_head="$(printf '%s' "${sc_out}" | head -n 200)" - { - printf '%s\n' '### ShellCheck (advisory)' - printf '%s\n' '```' - printf '%s\n' "${sc_head}" - printf '%s\n' '```' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - fi - - spdx_missing=() - IFS=',' read -r -a spdx_globs <<< "${SPDX_FILE_GLOBS}" - spdx_args=() - for g in "${spdx_globs[@]}"; do spdx_args+=("${g}"); done - - while IFS= read -r f; do - [ -z "${f}" ] && continue - if ! head -n 40 "${f}" | grep -q 'SPDX-License-Identifier:'; then - spdx_missing+=("${f}") - fi - done < <(git ls-files "${spdx_args[@]}" 2>/dev/null || true) - - if [ "${#spdx_missing[@]}" -gt 0 ]; then - extended_findings+=("SPDX header missing in some tracked files (advisory)") - { - printf '%s\n' '### SPDX header advisory' - printf '%s\n' 'Files missing SPDX-License-Identifier (first 40 lines scan):' - for f in "${spdx_missing[@]}"; do printf '%s\n' "- ${f}"; done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - - stale_cutoff_days=180 - stale_branches="$(git for-each-ref --format='%(refname:short) %(committerdate:unix)' refs/remotes/origin 2>/dev/null | awk -v now="$(date +%s)" -v days="${stale_cutoff_days}" '{if (now-$2 > days*86400) print $1}' | head -50)" - if [ -n "${stale_branches}" ]; then - extended_findings+=("Stale remote branches detected (advisory)") - { - printf '%s\n' '### Git hygiene advisory' - printf '%s\n' "Branches with last commit older than ${stale_cutoff_days} days (sample up to 50):" - while IFS= read -r b; do [ -n "${b}" ] && printf '%s\n' "- ${b}"; done <<< "${stale_branches}" - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - fi - - { - printf '%s\n' '### Guardrails coverage matrix' - printf '%s\n' '| Domain | Status | Notes |' - printf '%s\n' '|---|---|---|' - printf '%s\n' '| Access control | OK | Admin-only execution gate |' - printf '%s\n' '| Release variables | OK | Repository variables validation |' - printf '%s\n' '| Scripts governance | OK | Directory policy and advisory reporting |' - printf '%s\n' '| Repo required artifacts | OK | Required, optional, disallowed enforcement |' - printf '%s\n' '| Repo content heuristics | OK | Brand, license, changelog structure |' - if [ "${extended_enabled}" = 'true' ]; then - if [ "${#extended_findings[@]}" -gt 0 ]; then - printf '%s\n' '| Extended checks | Warning | See extended findings below |' - else - printf '%s\n' '| Extended checks | OK | No findings |' - fi - else - printf '%s\n' '| Extended checks | SKIPPED | EXTENDED_CHECKS disabled |' - fi - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - - if [ "${extended_enabled}" = 'true' ] && [ "${#extended_findings[@]}" -gt 0 ]; then - { - printf '%s\n' '### Extended findings (advisory)' - for f in "${extended_findings[@]}"; do printf '%s\n' "- ${f}"; done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - - printf '%s\n' 'Repository health guardrails passed.' >> "${GITHUB_STEP_SUMMARY}" - - - site-health: - name: Site Health - runs-on: ubuntu-latest - if: github.event_name == 'workflow_dispatch' - steps: - - uses: actions/checkout@v4 - - - name: Setup PHP - uses: shivammathur/setup-php@v2 - with: - php-version: '8.3' - - - name: Uptime check - if: env.URLS != '' - run: | - echo "$URLS" > /tmp/urls.txt - php monitoring/uptime-probe.php --urls /tmp/urls.txt --timeout 15 || echo "::warning::Some sites are down" - rm -f /tmp/urls.txt - env: - URLS: ${{ vars.MONITORED_URLS }} - - - name: SSL certificate check - if: env.DOMAINS != '' - run: | - echo "$DOMAINS" > /tmp/domains.txt - php monitoring/ssl-check.php --domains /tmp/domains.txt --warn-days 30 || echo "::warning::SSL certificates expiring soon" - rm -f /tmp/domains.txt - env: - DOMAINS: ${{ vars.MONITORED_DOMAINS }} - - - name: Summary - if: always() - run: | - echo "### Site Health" >> $GITHUB_STEP_SUMMARY - echo "Uptime and SSL checks completed." >> $GITHUB_STEP_SUMMARY - +# ============================================================================ +# Copyright (C) 2025 Moko Consulting +# +# This file is part of a Moko Consulting project. +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +# FILE INFORMATION +# DEFGROUP: Gitea.Workflow +# INGROUP: moko-platform.Validation +# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform +# PATH: /templates/workflows/joomla/repo_health.yml.template +# VERSION: 09.23.00 +# BRIEF: Enforces repository guardrails by validating release configuration, scripts governance, tooling availability, and core repository health artifacts. +# ============================================================================ + +name: "Generic: Repo Health" + +defaults: + run: + shell: bash + +on: + workflow_dispatch: + inputs: + profile: + description: 'Validation profile: all, release, scripts, or repo' + required: true + default: all + type: choice + options: + - all + - release + - scripts + - repo + pull_request: + push: + +permissions: + contents: read + +env: + # Release policy - Repository Variables Only + RELEASE_REQUIRED_REPO_VARS: RS_FTP_PATH_SUFFIX + RELEASE_OPTIONAL_REPO_VARS: DEV_FTP_SUFFIX + + # Scripts governance policy + SCRIPTS_REQUIRED_DIRS: + SCRIPTS_ALLOWED_DIRS: scripts,scripts/fix,scripts/lib,scripts/release,scripts/run,scripts/validate + + # Repo health policy + REPO_REQUIRED_ARTIFACTS: README.md,LICENSE,CHANGELOG.md,CONTRIBUTING.md,CODE_OF_CONDUCT.md,.mokogitea/workflows/ + REPO_OPTIONAL_FILES: SECURITY.md,GOVERNANCE.md,.editorconfig,.gitattributes,.gitignore,README.md,docs/ + REPO_DISALLOWED_DIRS: + REPO_DISALLOWED_FILES: TODO.md,todo.md + + # Extended checks toggles + EXTENDED_CHECKS: "true" + + # File / directory variables + DOCS_INDEX: docs/docs-index.md + SCRIPT_DIR: scripts + WORKFLOWS_DIR: .mokogitea/workflows + SHELLCHECK_PATTERN: '*.sh' + SPDX_FILE_GLOBS: '*.sh,*.php,*.js,*.ts,*.css,*.xml,*.yml,*.yaml' + FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true + +jobs: + access_check: + name: Access control + runs-on: ubuntu-latest + timeout-minutes: 10 + permissions: + contents: read + + outputs: + allowed: ${{ steps.perm.outputs.allowed }} + permission: ${{ steps.perm.outputs.permission }} + + steps: + - name: Check actor permission (admin only) + id: perm + env: + TOKEN: ${{ secrets.MOKOGITEA_TOKEN || secrets.MOKOGITEA_TOKEN || github.token }} + REPO: ${{ github.repository }} + ACTOR: ${{ github.actor }} + run: | + set -euo pipefail + ALLOWED=false + PERMISSION=unknown + METHOD="" + + # Hardcoded authorized users — always allowed + case "$ACTOR" in + jmiller|gitea-actions[bot]) + ALLOWED=true + PERMISSION=admin + METHOD="hardcoded allowlist" + ;; + *) + # Detect platform and check permissions via API + API_BASE="${GITHUB_API_URL:-${GITEA_API_URL:-https://api.github.com}}" + RESP=$(curl -sf -H "Authorization: token ${TOKEN}" \ + "${API_BASE}/repos/${REPO}/collaborators/${ACTOR}/permission" 2>/dev/null || echo '{}') + PERMISSION=$(echo "$RESP" | grep -oP '"permission"\s*:\s*"\K[^"]+' || echo "unknown") + if [ "$PERMISSION" = "admin" ] || [ "$PERMISSION" = "maintain" ] || [ "$PERMISSION" = "owner" ]; then + ALLOWED=true + fi + METHOD="collaborator API" + ;; + esac + + echo "permission=${PERMISSION}" >> "$GITHUB_OUTPUT" + echo "allowed=${ALLOWED}" >> "$GITHUB_OUTPUT" + + { + echo "## Access Authorization" + echo "" + echo "| Field | Value |" + echo "|-------|-------|" + echo "| **Actor** | \`${ACTOR}\` |" + echo "| **Repository** | \`${REPO}\` |" + echo "| **Permission** | \`${PERMISSION}\` |" + echo "| **Method** | ${METHOD} |" + echo "| **Authorized** | ${ALLOWED} |" + echo "" + if [ "$ALLOWED" = "true" ]; then + echo "${ACTOR} authorized (${METHOD})" + else + echo "${ACTOR} is NOT authorized. Requires admin or maintain role." + fi + } >> "${GITHUB_STEP_SUMMARY}" + + - name: Deny execution when not permitted + if: ${{ steps.perm.outputs.allowed != 'true' }} + run: | + set -euo pipefail + printf '%s\n' 'ERROR: Access denied. Admin permission required.' >> "${GITHUB_STEP_SUMMARY}" + exit 1 + + release_config: + name: Release configuration + needs: access_check + if: ${{ needs.access_check.outputs.allowed == 'true' }} + runs-on: ubuntu-latest + timeout-minutes: 20 + permissions: + contents: read + + steps: + - name: Checkout + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + fetch-depth: 0 + + - name: Guardrails release vars + env: + PROFILE_RAW: ${{ github.event.inputs.profile }} + RS_FTP_PATH_SUFFIX: ${{ vars.RS_FTP_PATH_SUFFIX }} + DEV_FTP_SUFFIX: ${{ vars.DEV_FTP_SUFFIX }} + run: | + set -euo pipefail + + profile="${PROFILE_RAW:-all}" + case "${profile}" in + all|release|scripts|repo) ;; + *) + printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" + exit 1 + ;; + esac + + if [ "${profile}" = 'scripts' ] || [ "${profile}" = 'repo' ]; then + { + printf '%s\n' '### Release configuration (Repository Variables)' + printf '%s\n' "Profile: ${profile}" + printf '%s\n' 'Status: SKIPPED' + printf '%s\n' 'Reason: profile excludes release validation' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + exit 0 + fi + + IFS=',' read -r -a required <<< "${RELEASE_REQUIRED_REPO_VARS}" + IFS=',' read -r -a optional <<< "${RELEASE_OPTIONAL_REPO_VARS}" + + missing=() + missing_optional=() + + for k in "${required[@]}"; do + v="${!k:-}" + [ -z "${v}" ] && missing+=("${k}") + done + + for k in "${optional[@]}"; do + v="${!k:-}" + [ -z "${v}" ] && missing_optional+=("${k}") + done + + { + printf '%s\n' '### Release configuration (Repository Variables)' + printf '%s\n' "Profile: ${profile}" + printf '%s\n' '| Variable | Status |' + printf '%s\n' '|---|---|' + printf '%s\n' "| RS_FTP_PATH_SUFFIX | ${RS_FTP_PATH_SUFFIX:-NOT SET} |" + printf '%s\n' "| DEV_FTP_SUFFIX | ${DEV_FTP_SUFFIX:-NOT SET} |" + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + + if [ "${#missing_optional[@]}" -gt 0 ]; then + { + printf '%s\n' '### Missing optional repository variables' + for m in "${missing_optional[@]}"; do printf '%s\n' "- ${m}"; done + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + + if [ "${#missing[@]}" -gt 0 ]; then + { + printf '%s\n' '### Missing required repository variables' + for m in "${missing[@]}"; do printf '%s\n' "- ${m}"; done + printf '%s\n' 'ERROR: Guardrails failed. Missing required repository variables.' + } >> "${GITHUB_STEP_SUMMARY}" + exit 1 + fi + + { + printf '%s\n' '### Repository variables validation result' + printf '%s\n' 'Status: OK' + printf '%s\n' 'All required repository variables present.' + printf '%s\n' '' + printf '%s\n' '**Note**: Organization secrets (RS_FTP_HOST, RS_FTP_USER, etc.) are validated at deployment time, not in repository health checks.' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + + scripts_governance: + name: Scripts governance + needs: access_check + if: ${{ needs.access_check.outputs.allowed == 'true' }} + runs-on: ubuntu-latest + timeout-minutes: 15 + permissions: + contents: read + + steps: + - name: Checkout + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + fetch-depth: 0 + + - name: Scripts folder checks + env: + PROFILE_RAW: ${{ github.event.inputs.profile }} + run: | + set -euo pipefail + + profile="${PROFILE_RAW:-all}" + case "${profile}" in + all|release|scripts|repo) ;; + *) + printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" + exit 1 + ;; + esac + + if [ "${profile}" = 'release' ] || [ "${profile}" = 'repo' ]; then + { + printf '%s\n' '### Scripts governance' + printf '%s\n' "Profile: ${profile}" + printf '%s\n' 'Status: SKIPPED' + printf '%s\n' 'Reason: profile excludes scripts governance' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + exit 0 + fi + + if [ ! -d "${SCRIPT_DIR}" ]; then + { + printf '%s\n' '### Scripts governance' + printf '%s\n' 'Status: OK (advisory)' + printf '%s\n' 'scripts/ directory not present. No scripts governance enforced.' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + exit 0 + fi + + if [ -n "${SCRIPTS_REQUIRED_DIRS:-}" ]; then IFS=',' read -r -a required_dirs <<< "${SCRIPTS_REQUIRED_DIRS}"; else required_dirs=(); fi + IFS=',' read -r -a allowed_dirs <<< "${SCRIPTS_ALLOWED_DIRS}" + + missing_dirs=() + unapproved_dirs=() + + for d in "${required_dirs[@]}"; do + req="${d%/}" + [ ! -d "${req}" ] && missing_dirs+=("${req}/") + done + + while IFS= read -r d; do + allowed=false + for a in "${allowed_dirs[@]}"; do + a_norm="${a%/}" + [ "${d%/}" = "${a_norm}" ] && allowed=true + done + [ "${allowed}" = false ] && unapproved_dirs+=("${d%/}/") + done < <(find "${SCRIPT_DIR}" -maxdepth 1 -mindepth 1 -type d 2>/dev/null | sed 's#^\./##') + + { + printf '%s\n' '### Scripts governance' + printf '%s\n' "Profile: ${profile}" + printf '%s\n' '| Area | Status | Notes |' + printf '%s\n' '|---|---|---|' + + if [ "${#missing_dirs[@]}" -gt 0 ]; then + printf '%s\n' '| Required directories | Warning | Missing required subfolders |' + else + printf '%s\n' '| Required directories | OK | All required subfolders present |' + fi + + if [ "${#unapproved_dirs[@]}" -gt 0 ]; then + printf '%s\n' '| Directory policy | Warning | Unapproved directories detected |' + else + printf '%s\n' '| Directory policy | OK | No unapproved directories |' + fi + + printf '%s\n' '| Enforcement mode | Advisory | scripts folder is optional |' + printf '\n' + + if [ "${#missing_dirs[@]}" -gt 0 ]; then + printf '%s\n' 'Missing required script directories:' + for m in "${missing_dirs[@]}"; do printf '%s\n' "- ${m}"; done + printf '\n' + else + printf '%s\n' 'Missing required script directories: none.' + printf '\n' + fi + + if [ "${#unapproved_dirs[@]}" -gt 0 ]; then + printf '%s\n' 'Unapproved script directories detected:' + for m in "${unapproved_dirs[@]}"; do printf '%s\n' "- ${m}"; done + printf '\n' + else + printf '%s\n' 'Unapproved script directories detected: none.' + printf '\n' + fi + + printf '%s\n' 'Scripts governance completed in advisory mode.' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + + repo_health: + name: Repository health + needs: access_check + if: ${{ needs.access_check.outputs.allowed == 'true' }} + runs-on: ubuntu-latest + timeout-minutes: 20 + permissions: + contents: read + + steps: + - name: Checkout + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + fetch-depth: 0 + + - name: Repository health checks + env: + PROFILE_RAW: ${{ github.event.inputs.profile }} + run: | + set -euo pipefail + + profile="${PROFILE_RAW:-all}" + case "${profile}" in + all|release|scripts|repo) ;; + *) + printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" + exit 1 + ;; + esac + + if [ "${profile}" = 'release' ] || [ "${profile}" = 'scripts' ]; then + { + printf '%s\n' '### Repository health' + printf '%s\n' "Profile: ${profile}" + printf '%s\n' 'Status: SKIPPED' + printf '%s\n' 'Reason: profile excludes repository health' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + exit 0 + fi + + IFS=',' read -r -a required_artifacts <<< "${REPO_REQUIRED_ARTIFACTS}" + IFS=',' read -r -a optional_files <<< "${REPO_OPTIONAL_FILES}" + if [ -n "${REPO_DISALLOWED_DIRS:-}" ]; then IFS=',' read -r -a disallowed_dirs <<< "${REPO_DISALLOWED_DIRS}"; else disallowed_dirs=(); fi + IFS=',' read -r -a disallowed_files <<< "${REPO_DISALLOWED_FILES:-}" + + missing_required=() + missing_optional=() + + # Source directory: src/ or htdocs/ (either is valid for extension repos) + SOURCE_DIR="" + if [ -d "src" ]; then + SOURCE_DIR="src" + elif [ -d "htdocs" ]; then + SOURCE_DIR="htdocs" + elif [ -d "deploy" ] || [ -d "cli" ] || [ -d "monitoring" ]; then + # Platform/tooling repos don't need src/ + SOURCE_DIR="" + else + missing_required+=("src/ or htdocs/ (source directory required)") + fi + + for item in "${required_artifacts[@]}"; do + if printf '%s' "${item}" | grep -q '/$'; then + d="${item%/}" + [ ! -d "${d}" ] && missing_required+=("${item}") + else + [ ! -f "${item}" ] && missing_required+=("${item}") + fi + done + + for f in "${optional_files[@]}"; do + if printf '%s' "${f}" | grep -q '/$'; then + d="${f%/}" + [ ! -d "${d}" ] && missing_optional+=("${f}") + else + [ ! -f "${f}" ] && missing_optional+=("${f}") + fi + done + + for d in "${disallowed_dirs[@]}"; do + d_norm="${d%/}" + [ -d "${d_norm}" ] && missing_required+=("${d_norm}/ (disallowed)") + done + + for f in "${disallowed_files[@]}"; do + [ -f "${f}" ] && missing_required+=("${f} (disallowed)") + done + + git fetch origin --prune + + dev_paths=() + dev_branches=() + + while IFS= read -r b; do + name="${b#origin/}" + if [ "${name}" = 'dev' ]; then + dev_branches+=("${name}") + else + dev_paths+=("${name}") + fi + done < <(git branch -r --list 'origin/dev*' | sed 's/^ *//') + + if [ "${#dev_paths[@]}" -eq 0 ] && [ "${#dev_branches[@]}" -eq 0 ]; then + missing_required+=("dev or dev/* branch") + fi + + content_warnings=() + + if [ -f 'CHANGELOG.md' ] && ! grep -Eq '^# Changelog' CHANGELOG.md; then + content_warnings+=("CHANGELOG.md missing '# Changelog' header") + fi + + if [ -f 'CHANGELOG.md' ] && grep -Eq '^[# ]*Unreleased' CHANGELOG.md; then + content_warnings+=("CHANGELOG.md contains Unreleased section (review release readiness)") + fi + + if [ -f 'LICENSE' ] && ! grep -qiE 'GNU GENERAL PUBLIC LICENSE|GPL' LICENSE; then + content_warnings+=("LICENSE does not look like a GPL text") + fi + + if [ -f 'README.md' ] && ! grep -qiE 'moko|Moko' README.md; then + content_warnings+=("README.md missing expected brand keyword") + fi + + export PROFILE_RAW="${profile}" + export MISSING_REQUIRED="$(printf '%s\n' "${missing_required[@]:-}")" + export MISSING_OPTIONAL="$(printf '%s\n' "${missing_optional[@]:-}")" + export CONTENT_WARNINGS="$(printf '%s\n' "${content_warnings[@]:-}")" + + report_json=$(printf '{"profile":"%s","missing_required":%d,"missing_optional":%d,"content_warnings":%d}' "$profile" "${#missing_required[@]}" "${#missing_optional[@]}" "${#content_warnings[@]}") + + { + printf '%s\n' '### Repository health' + printf '%s\n' "Profile: ${profile}" + printf '%s\n' '| Metric | Value |' + printf '%s\n' '|---|---|' + printf '%s\n' "| Missing required | ${#missing_required[@]} |" + printf '%s\n' "| Missing optional | ${#missing_optional[@]} |" + printf '%s\n' "| Content warnings | ${#content_warnings[@]} |" + printf '\n' + + printf '%s\n' '### Guardrails report (JSON)' + printf '%s\n' '```json' + printf '%s\n' "${report_json}" + printf '%s\n' '```' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + + if [ "${#missing_required[@]}" -gt 0 ]; then + { + printf '%s\n' '### Missing required repo artifacts' + for m in "${missing_required[@]}"; do printf '%s\n' "- ${m}"; done + printf '%s\n' 'ERROR: Guardrails failed. Missing required repository artifacts.' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + exit 1 + fi + + if [ "${#missing_optional[@]}" -gt 0 ]; then + { + printf '%s\n' '### Missing optional repo artifacts' + for m in "${missing_optional[@]}"; do printf '%s\n' "- ${m}"; done + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + + if [ "${#content_warnings[@]}" -gt 0 ]; then + { + printf '%s\n' '### Repo content warnings' + for m in "${content_warnings[@]}"; do printf '%s\n' "- ${m}"; done + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + + # -- Joomla-specific checks -- + joomla_findings=() + + MANIFEST="$(find . -maxdepth 2 -name '*.xml' -exec grep -l '/dev/null | head -1 || true)" + if [ -z "${MANIFEST}" ]; then + joomla_findings+=("Joomla XML manifest not found (no *.xml with tag)") + else + if ! grep -qP '' "${MANIFEST}"; then + joomla_findings+=("XML manifest: tag missing") + fi + if ! grep -qP 'type="(component|module|plugin|library|package|template|language)"' "${MANIFEST}"; then + joomla_findings+=("XML manifest: type attribute missing or invalid") + fi + if ! grep -qP '' "${MANIFEST}"; then + joomla_findings+=("XML manifest: tag missing") + fi + if ! grep -qP '' "${MANIFEST}"; then + joomla_findings+=("XML manifest: tag missing") + fi + if ! grep -qP ' missing (required for Joomla 5+)") + fi + fi + + INI_COUNT="$(find . -name '*.ini' -type f 2>/dev/null | wc -l)" + if [ "${INI_COUNT}" -eq 0 ]; then + joomla_findings+=("No .ini language files found") + fi + + if [ ! -f 'updates.xml' ]; then + joomla_findings+=("updates.xml missing in root (required for Joomla update server)") + fi + + if [ -n "${SOURCE_DIR}" ]; then + INDEX_DIRS=("${SOURCE_DIR}" "${SOURCE_DIR}/admin" "${SOURCE_DIR}/site") + for dir in "${INDEX_DIRS[@]}"; do + if [ -d "${dir}" ] && [ ! -f "${dir}/index.html" ]; then + joomla_findings+=("${dir}/index.html missing (directory listing protection)") + fi + done + fi + + if [ "${#joomla_findings[@]}" -gt 0 ]; then + { + printf '%s\n' '### Joomla extension checks' + printf '%s\n' '| Check | Status |' + printf '%s\n' '|---|---|' + for f in "${joomla_findings[@]}"; do + printf '%s\n' "| ${f} | Warning |" + done + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + else + { + printf '%s\n' '### Joomla extension checks' + printf '%s\n' 'All Joomla-specific checks passed.' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + + extended_enabled="${EXTENDED_CHECKS:-true}" + extended_findings=() + + if [ "${extended_enabled}" = 'true' ]; then + if [ -f '.github/CODEOWNERS' ] || [ -f 'CODEOWNERS' ] || [ -f 'docs/CODEOWNERS' ]; then + : + else + extended_findings+=("CODEOWNERS not found (.github/CODEOWNERS preferred)") + fi + + if ls "${WORKFLOWS_DIR}"/*.yml >/dev/null 2>&1 || ls "${WORKFLOWS_DIR}"/*.yaml >/dev/null 2>&1; then + bad_refs="$(grep -RIn --include='*.yml' --include='*.yaml' -E '^[[:space:]]*uses:[[:space:]]*[^#]+@(main|master)\b' "${WORKFLOWS_DIR}" 2>/dev/null || true)" + if [ -n "${bad_refs}" ]; then + extended_findings+=("Workflows reference actions @main/@master (pin versions): see log excerpt") + { + printf '%s\n' '### Workflow pinning advisory' + printf '%s\n' 'Found uses: entries pinned to main/master:' + printf '%s\n' '```' + printf '%s\n' "${bad_refs}" + printf '%s\n' '```' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + fi + + if [ -f "${DOCS_INDEX}" ]; then + missing_links="" + while IFS= read -r docline; do + for link in $(echo "$docline" | grep -oE '\]\([^)]+\)' | sed 's/\](//' | sed 's/)$//' || true); do + case "$link" in http://*|https://*|"#"*|mailto:*) continue ;; esac + linkpath="${link%%#*}" + linkpath="${linkpath%%\?*}" + [ -z "$linkpath" ] && continue + if [ "${linkpath:0:1}" = "/" ]; then + testpath="${linkpath#/}" + else + testpath="$(dirname "${DOCS_INDEX}")/${linkpath}" + fi + [ ! -e "$testpath" ] && missing_links="${missing_links}${testpath} " + done + done < "${DOCS_INDEX}" + if [ -n "${missing_links}" ]; then + extended_findings+=("docs/docs-index.md contains broken relative links") + { + printf '%s\n' '### Docs index link integrity' + printf '%s\n' 'Broken relative links:' + for bl in ${missing_links}; do + printf '%s\n' "- ${bl}" + done + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + fi + + if [ -d "${SCRIPT_DIR}" ]; then + if ! command -v shellcheck >/dev/null 2>&1; then + sudo apt-get update -qq + sudo apt-get install -y shellcheck >/dev/null + fi + + sc_out='' + while IFS= read -r shf; do + [ -z "${shf}" ] && continue + out_one="$(shellcheck -S warning -x "${shf}" 2>/dev/null || true)" + if [ -n "${out_one}" ]; then + sc_out="${sc_out}${out_one}\n" + fi + done < <(find "${SCRIPT_DIR}" -type f -name "${SHELLCHECK_PATTERN}" 2>/dev/null | sort) + + if [ -n "${sc_out}" ]; then + extended_findings+=("ShellCheck warnings detected (advisory)") + sc_head="$(printf '%s' "${sc_out}" | head -n 200)" + { + printf '%s\n' '### ShellCheck (advisory)' + printf '%s\n' '```' + printf '%s\n' "${sc_head}" + printf '%s\n' '```' + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + fi + + spdx_missing=() + IFS=',' read -r -a spdx_globs <<< "${SPDX_FILE_GLOBS}" + spdx_args=() + for g in "${spdx_globs[@]}"; do spdx_args+=("${g}"); done + + while IFS= read -r f; do + [ -z "${f}" ] && continue + if ! head -n 40 "${f}" | grep -q 'SPDX-License-Identifier:'; then + spdx_missing+=("${f}") + fi + done < <(git ls-files "${spdx_args[@]}" 2>/dev/null || true) + + if [ "${#spdx_missing[@]}" -gt 0 ]; then + extended_findings+=("SPDX header missing in some tracked files (advisory)") + { + printf '%s\n' '### SPDX header advisory' + printf '%s\n' 'Files missing SPDX-License-Identifier (first 40 lines scan):' + for f in "${spdx_missing[@]}"; do printf '%s\n' "- ${f}"; done + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + + stale_cutoff_days=180 + stale_branches="$(git for-each-ref --format='%(refname:short) %(committerdate:unix)' refs/remotes/origin 2>/dev/null | awk -v now="$(date +%s)" -v days="${stale_cutoff_days}" '{if (now-$2 > days*86400) print $1}' | head -50)" + if [ -n "${stale_branches}" ]; then + extended_findings+=("Stale remote branches detected (advisory)") + { + printf '%s\n' '### Git hygiene advisory' + printf '%s\n' "Branches with last commit older than ${stale_cutoff_days} days (sample up to 50):" + while IFS= read -r b; do [ -n "${b}" ] && printf '%s\n' "- ${b}"; done <<< "${stale_branches}" + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + fi + + { + printf '%s\n' '### Guardrails coverage matrix' + printf '%s\n' '| Domain | Status | Notes |' + printf '%s\n' '|---|---|---|' + printf '%s\n' '| Access control | OK | Admin-only execution gate |' + printf '%s\n' '| Release variables | OK | Repository variables validation |' + printf '%s\n' '| Scripts governance | OK | Directory policy and advisory reporting |' + printf '%s\n' '| Repo required artifacts | OK | Required, optional, disallowed enforcement |' + printf '%s\n' '| Repo content heuristics | OK | Brand, license, changelog structure |' + if [ "${extended_enabled}" = 'true' ]; then + if [ "${#extended_findings[@]}" -gt 0 ]; then + printf '%s\n' '| Extended checks | Warning | See extended findings below |' + else + printf '%s\n' '| Extended checks | OK | No findings |' + fi + else + printf '%s\n' '| Extended checks | SKIPPED | EXTENDED_CHECKS disabled |' + fi + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + + if [ "${extended_enabled}" = 'true' ] && [ "${#extended_findings[@]}" -gt 0 ]; then + { + printf '%s\n' '### Extended findings (advisory)' + for f in "${extended_findings[@]}"; do printf '%s\n' "- ${f}"; done + printf '\n' + } >> "${GITHUB_STEP_SUMMARY}" + fi + + printf '%s\n' 'Repository health guardrails passed.' >> "${GITHUB_STEP_SUMMARY}" + + + site-health: + name: Site Health + runs-on: ubuntu-latest + if: github.event_name == 'workflow_dispatch' + steps: + - uses: actions/checkout@v4 + + - name: Setup PHP + uses: shivammathur/setup-php@v2 + with: + php-version: '8.3' + + - name: Uptime check + if: env.URLS != '' + run: | + echo "$URLS" > /tmp/urls.txt + php monitoring/uptime-probe.php --urls /tmp/urls.txt --timeout 15 || echo "::warning::Some sites are down" + rm -f /tmp/urls.txt + env: + URLS: ${{ vars.MONITORED_URLS }} + + - name: SSL certificate check + if: env.DOMAINS != '' + run: | + echo "$DOMAINS" > /tmp/domains.txt + php monitoring/ssl-check.php --domains /tmp/domains.txt --warn-days 30 || echo "::warning::SSL certificates expiring soon" + rm -f /tmp/domains.txt + env: + DOMAINS: ${{ vars.MONITORED_DOMAINS }} + + - name: Summary + if: always() + run: | + echo "### Site Health" >> $GITHUB_STEP_SUMMARY + echo "Uptime and SSL checks completed." >> $GITHUB_STEP_SUMMARY + + # ═══════════════════════════════════════════════════════════════════════ + # Issue Reporter — file issues for failed gates + # ═══════════════════════════════════════════════════════════════════════ + report-issues: + name: "Report Issues" + runs-on: ubuntu-latest + needs: [access_check, release_config, scripts_governance, repo_health] + if: >- + always() && + (needs.release_config.result == 'failure' || + needs.scripts_governance.result == 'failure' || + needs.repo_health.result == 'failure') + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + sparse-checkout: automation/ci-issue-reporter.sh + sparse-checkout-cone-mode: false + + - name: "File issues for failed gates" + env: + GITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} + GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }} + run: | + chmod +x automation/ci-issue-reporter.sh + REPORTER="./automation/ci-issue-reporter.sh" + WF="Repo Health" + + report_gate() { + local gate="$1" result="$2" details="$3" + if [ "$result" = "failure" ]; then + "$REPORTER" --gate "$gate" --details "$details" --workflow "$WF" --severity error + fi + } + + report_gate "Release Configuration" \ + "${{ needs.release_config.result }}" \ + "Required repository variables are missing (RS_FTP_PATH_SUFFIX). Check repository settings." + + report_gate "Scripts Governance" \ + "${{ needs.scripts_governance.result }}" \ + "Scripts directory policy violations detected. Review required and allowed directories." + + report_gate "Repository Health" \ + "${{ needs.repo_health.result }}" \ + "Repository health checks failed — missing required artifacts, disallowed files, or content warnings. Check the CI run summary." + From 240a947bec383227e502919d5981a0c229522066 Mon Sep 17 00:00:00 2001 From: Moko Consulting Date: Tue, 2 Jun 2026 21:33:06 +0000 Subject: [PATCH 048/220] chore(ci): sync CI issue reporter from Template-Joomla --- .mokogitea/workflows/pr-check.yml | 500 ++++++++++++++++-------------- 1 file changed, 264 insertions(+), 236 deletions(-) diff --git a/.mokogitea/workflows/pr-check.yml b/.mokogitea/workflows/pr-check.yml index d1aac4e6..e2c82ef2 100644 --- a/.mokogitea/workflows/pr-check.yml +++ b/.mokogitea/workflows/pr-check.yml @@ -1,236 +1,264 @@ -# Copyright (C) 2026 Moko Consulting -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# FILE INFORMATION -# DEFGROUP: Gitea.Workflow -# INGROUP: moko-platform.CI -# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform -# PATH: /templates/workflows/universal/pr-check.yml.template -# VERSION: 09.23.00 -# BRIEF: PR gate — branch policy + code validation before merge - -name: "Universal: PR Check" - -on: - pull_request: - types: [opened, synchronize, reopened, edited] - -permissions: - contents: read - pull-requests: write - -env: - FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true - -jobs: - # ── Branch Policy ────────────────────────────────────────────────────── - branch-policy: - name: Branch Policy - runs-on: ubuntu-latest - steps: - - name: Check branch merge target - run: | - HEAD="${{ github.head_ref }}" - BASE="${{ github.base_ref }}" - - echo "PR: ${HEAD} → ${BASE}" - - ALLOWED=true - REASON="" - - case "$HEAD" in - feature/*|feat/*) - if [ "$BASE" != "dev" ]; then - ALLOWED=false - REASON="Feature branches must target 'dev', not '${BASE}'" - fi - ;; - fix/*|bugfix/*) - if [ "$BASE" != "dev" ]; then - ALLOWED=false - REASON="Fix branches must target 'dev', not '${BASE}'" - fi - ;; - patch/*) - if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ]; then - ALLOWED=false - REASON="Patch branches must target 'dev' or 'rc', not '${BASE}'" - fi - ;; - hotfix/*) - if [ "$BASE" != "dev" ] && [ "$BASE" != "main" ]; then - ALLOWED=false - REASON="Hotfix branches can only target 'dev' or 'main', not '${BASE}'" - fi - ;; - rc) - if [ "$BASE" != "main" ]; then - ALLOWED=false - REASON="RC branch can only merge into 'main', not '${BASE}'" - fi - ;; - dev) - if [ "$BASE" != "main" ]; then - ALLOWED=false - REASON="Dev branch can only merge into 'main', not '${BASE}'" - fi - ;; - esac - - if [ "$ALLOWED" = false ]; then - echo "::error::${REASON}" - echo "## Branch Policy Violation" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "${REASON}" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "### Allowed merge paths:" >> $GITHUB_STEP_SUMMARY - echo "- \`feature/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY - echo "- \`fix/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY - echo "- \`hotfix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY - echo "- \`dev\` → \`main\`" >> $GITHUB_STEP_SUMMARY - echo "- \`rc/*\` → \`main\`" >> $GITHUB_STEP_SUMMARY - exit 1 - fi - - echo "Branch policy: OK (${HEAD} → ${BASE})" - echo "## Branch Policy: Passed" >> $GITHUB_STEP_SUMMARY - - # ── Code Validation ──────────────────────────────────────────────────── - validate: - name: Validate PR - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Detect platform - id: platform - run: | - # Read platform from XML manifest ( tag) or plain text fallback - PLATFORM=$(sed -n 's/.*\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1) - [ -z "$PLATFORM" ] && PLATFORM=$(cat .mokogitea/manifest.xml 2>/dev/null | tr -d '[:space:]') - [ -z "$PLATFORM" ] && PLATFORM="generic" - echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT" - - - name: Setup PHP - if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr' - run: | - if ! command -v php &> /dev/null; then - sudo apt-get update -qq - sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1 - fi - - - name: PHP syntax check - if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr' - run: | - ERRORS=0 - while IFS= read -r -d '' file; do - if ! php -l "$file" 2>&1 | grep -q "No syntax errors"; then - ERRORS=$((ERRORS + 1)) - fi - done < <(find . -name "*.php" -not -path "./.git/*" -not -path "./vendor/*" -print0) - echo "PHP lint: ${ERRORS} error(s)" - [ "$ERRORS" -eq 0 ] || { echo "::error::PHP syntax errors found"; exit 1; } - - - name: Validate platform manifest - run: | - PLATFORM="${{ steps.platform.outputs.platform }}" - case "$PLATFORM" in - joomla) - MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '/dev/null | head -1) - if [ -z "$MANIFEST" ]; then - echo "::warning::No Joomla manifest found (WaaS site)" - exit 0 - fi - echo "Manifest: ${MANIFEST}" - if command -v php &> /dev/null; then - php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('$MANIFEST'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::Manifest XML is malformed"; exit 1; } - fi - for ELEMENT in name version description; do - grep -q "<${ELEMENT}>" "$MANIFEST" || { echo "::error::Missing <${ELEMENT}> in manifest"; exit 1; } - done - echo "Joomla manifest valid" - ;; - dolibarr) - MOD_FILE=$(find . -maxdepth 4 -name "mod*.class.php" ! -path "./.git/*" -exec grep -l 'extends DolibarrModules' {} \; 2>/dev/null | head -1) - if [ -z "$MOD_FILE" ]; then - echo "::error::No mod*.class.php found" - exit 1 - fi - echo "Dolibarr module: ${MOD_FILE}" - ;; - *) - echo "Generic platform — no manifest validation" - ;; - esac - - - name: Check update stream format - run: | - PLATFORM="${{ steps.platform.outputs.platform }}" - case "$PLATFORM" in - joomla) - if [ -f "updates.xml" ]; then - if command -v php &> /dev/null; then - php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('updates.xml'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::updates.xml is malformed"; exit 1; } - fi - echo "updates.xml valid" - fi - ;; - dolibarr) - [ -f "update.txt" ] && echo "update.txt present" || echo "::warning::No update.txt" - ;; - esac - - - name: Check changelog has unreleased entry - run: | - if [ ! -f "CHANGELOG.md" ]; then - echo "::warning::No CHANGELOG.md found" - exit 0 - fi - # Check for content under [Unreleased] section - if ! grep -q "## \[Unreleased\]" CHANGELOG.md; then - echo "::error::CHANGELOG.md missing [Unreleased] section" - exit 1 - fi - # Check there's at least one entry (Added/Changed/Fixed/Removed) under Unreleased - UNRELEASED_CONTENT=$(sed -n '/## \[Unreleased\]/,/## \[/p' CHANGELOG.md | grep -cE '^\s*-\s' || true) - if [ "$UNRELEASED_CONTENT" -eq 0 ]; then - echo "::error::CHANGELOG.md [Unreleased] section has no entries. Add a changelog entry describing your changes." - echo "## Changelog Check: Failed" >> $GITHUB_STEP_SUMMARY - echo "The \`[Unreleased]\` section in CHANGELOG.md has no entries." >> $GITHUB_STEP_SUMMARY - echo "Add a line like \`- Description of your change\` under a heading (\`### Added\`, \`### Changed\`, \`### Fixed\`, etc.)" >> $GITHUB_STEP_SUMMARY - exit 1 - fi - echo "Changelog: ${UNRELEASED_CONTENT} entry/entries in [Unreleased]" - - - name: Verify package source - run: | - SOURCE_DIR="src" - [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs" - if [ ! -d "$SOURCE_DIR" ]; then - echo "::warning::No src/ or htdocs/ directory" - exit 0 - fi - FILE_COUNT=$(find "$SOURCE_DIR" -type f | wc -l) - echo "Source: ${FILE_COUNT} files" - [ "$FILE_COUNT" -gt 0 ] || { echo "::error::Source directory is empty"; exit 1; } - - # ── Pre-Release RC Build ───────────────────────────────────────────────── - pre-release: - name: Build RC Package - runs-on: ubuntu-latest - needs: [branch-policy, validate] - - steps: - - name: Trigger RC pre-release - env: - GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} - REPO: ${{ github.repository }} - BRANCH: ${{ github.head_ref }} - GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }} - run: | - curl -s -X POST "${GITEA_URL}/api/v1/repos/${REPO}/actions/workflows/pre-release.yml/dispatches" -H "Authorization: token ${GITEA_TOKEN}" -H "Content-Type: application/json" -d "{\"ref\":\"${BRANCH}\",\"inputs\":{\"stability\":\"release-candidate\"}}" - echo "### Pre-Release" >> $GITHUB_STEP_SUMMARY - echo "Triggered RC build on branch \`${BRANCH}\`" >> $GITHUB_STEP_SUMMARY +# Copyright (C) 2026 Moko Consulting +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +# FILE INFORMATION +# DEFGROUP: Gitea.Workflow +# INGROUP: moko-platform.CI +# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform +# PATH: /templates/workflows/universal/pr-check.yml.template +# VERSION: 09.23.00 +# BRIEF: PR gate — branch policy + code validation before merge + +name: "Universal: PR Check" + +on: + pull_request: + types: [opened, synchronize, reopened, edited] + +permissions: + contents: read + pull-requests: write + +env: + FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true + +jobs: + # ── Branch Policy ────────────────────────────────────────────────────── + branch-policy: + name: Branch Policy + runs-on: ubuntu-latest + steps: + - name: Check branch merge target + run: | + HEAD="${{ github.head_ref }}" + BASE="${{ github.base_ref }}" + + echo "PR: ${HEAD} → ${BASE}" + + ALLOWED=true + REASON="" + + case "$HEAD" in + feature/*|feat/*) + if [ "$BASE" != "dev" ]; then + ALLOWED=false + REASON="Feature branches must target 'dev', not '${BASE}'" + fi + ;; + fix/*|bugfix/*) + if [ "$BASE" != "dev" ]; then + ALLOWED=false + REASON="Fix branches must target 'dev', not '${BASE}'" + fi + ;; + patch/*) + if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ]; then + ALLOWED=false + REASON="Patch branches must target 'dev' or 'rc', not '${BASE}'" + fi + ;; + hotfix/*) + if [ "$BASE" != "dev" ] && [ "$BASE" != "main" ]; then + ALLOWED=false + REASON="Hotfix branches can only target 'dev' or 'main', not '${BASE}'" + fi + ;; + rc) + if [ "$BASE" != "main" ]; then + ALLOWED=false + REASON="RC branch can only merge into 'main', not '${BASE}'" + fi + ;; + dev) + if [ "$BASE" != "main" ]; then + ALLOWED=false + REASON="Dev branch can only merge into 'main', not '${BASE}'" + fi + ;; + esac + + if [ "$ALLOWED" = false ]; then + echo "::error::${REASON}" + echo "## Branch Policy Violation" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "${REASON}" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "### Allowed merge paths:" >> $GITHUB_STEP_SUMMARY + echo "- \`feature/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY + echo "- \`fix/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY + echo "- \`hotfix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY + echo "- \`dev\` → \`main\`" >> $GITHUB_STEP_SUMMARY + echo "- \`rc/*\` → \`main\`" >> $GITHUB_STEP_SUMMARY + exit 1 + fi + + echo "Branch policy: OK (${HEAD} → ${BASE})" + echo "## Branch Policy: Passed" >> $GITHUB_STEP_SUMMARY + + # ── Code Validation ──────────────────────────────────────────────────── + validate: + name: Validate PR + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Detect platform + id: platform + run: | + # Read platform from XML manifest ( tag) or plain text fallback + PLATFORM=$(sed -n 's/.*\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1) + [ -z "$PLATFORM" ] && PLATFORM=$(cat .mokogitea/manifest.xml 2>/dev/null | tr -d '[:space:]') + [ -z "$PLATFORM" ] && PLATFORM="generic" + echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT" + + - name: Setup PHP + if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr' + run: | + if ! command -v php &> /dev/null; then + sudo apt-get update -qq + sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1 + fi + + - name: PHP syntax check + if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr' + run: | + ERRORS=0 + while IFS= read -r -d '' file; do + if ! php -l "$file" 2>&1 | grep -q "No syntax errors"; then + ERRORS=$((ERRORS + 1)) + fi + done < <(find . -name "*.php" -not -path "./.git/*" -not -path "./vendor/*" -print0) + echo "PHP lint: ${ERRORS} error(s)" + [ "$ERRORS" -eq 0 ] || { echo "::error::PHP syntax errors found"; exit 1; } + + - name: Validate platform manifest + run: | + PLATFORM="${{ steps.platform.outputs.platform }}" + case "$PLATFORM" in + joomla) + MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '/dev/null | head -1) + if [ -z "$MANIFEST" ]; then + echo "::warning::No Joomla manifest found (WaaS site)" + exit 0 + fi + echo "Manifest: ${MANIFEST}" + if command -v php &> /dev/null; then + php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('$MANIFEST'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::Manifest XML is malformed"; exit 1; } + fi + for ELEMENT in name version description; do + grep -q "<${ELEMENT}>" "$MANIFEST" || { echo "::error::Missing <${ELEMENT}> in manifest"; exit 1; } + done + echo "Joomla manifest valid" + ;; + dolibarr) + MOD_FILE=$(find . -maxdepth 4 -name "mod*.class.php" ! -path "./.git/*" -exec grep -l 'extends DolibarrModules' {} \; 2>/dev/null | head -1) + if [ -z "$MOD_FILE" ]; then + echo "::error::No mod*.class.php found" + exit 1 + fi + echo "Dolibarr module: ${MOD_FILE}" + ;; + *) + echo "Generic platform — no manifest validation" + ;; + esac + + - name: Check update stream format + run: | + PLATFORM="${{ steps.platform.outputs.platform }}" + case "$PLATFORM" in + joomla) + if [ -f "updates.xml" ]; then + if command -v php &> /dev/null; then + php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('updates.xml'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::updates.xml is malformed"; exit 1; } + fi + echo "updates.xml valid" + fi + ;; + dolibarr) + [ -f "update.txt" ] && echo "update.txt present" || echo "::warning::No update.txt" + ;; + esac + + - name: Check changelog has unreleased entry + run: | + if [ ! -f "CHANGELOG.md" ]; then + echo "::warning::No CHANGELOG.md found" + exit 0 + fi + # Check for content under [Unreleased] section + if ! grep -q "## \[Unreleased\]" CHANGELOG.md; then + echo "::error::CHANGELOG.md missing [Unreleased] section" + exit 1 + fi + # Check there's at least one entry (Added/Changed/Fixed/Removed) under Unreleased + UNRELEASED_CONTENT=$(sed -n '/## \[Unreleased\]/,/## \[/p' CHANGELOG.md | grep -cE '^\s*-\s' || true) + if [ "$UNRELEASED_CONTENT" -eq 0 ]; then + echo "::error::CHANGELOG.md [Unreleased] section has no entries. Add a changelog entry describing your changes." + echo "## Changelog Check: Failed" >> $GITHUB_STEP_SUMMARY + echo "The \`[Unreleased]\` section in CHANGELOG.md has no entries." >> $GITHUB_STEP_SUMMARY + echo "Add a line like \`- Description of your change\` under a heading (\`### Added\`, \`### Changed\`, \`### Fixed\`, etc.)" >> $GITHUB_STEP_SUMMARY + exit 1 + fi + echo "Changelog: ${UNRELEASED_CONTENT} entry/entries in [Unreleased]" + + - name: Verify package source + run: | + SOURCE_DIR="src" + [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs" + if [ ! -d "$SOURCE_DIR" ]; then + echo "::warning::No src/ or htdocs/ directory" + exit 0 + fi + FILE_COUNT=$(find "$SOURCE_DIR" -type f | wc -l) + echo "Source: ${FILE_COUNT} files" + [ "$FILE_COUNT" -gt 0 ] || { echo "::error::Source directory is empty"; exit 1; } + + # ── Pre-Release RC Build ───────────────────────────────────────────────── + pre-release: + name: Build RC Package + runs-on: ubuntu-latest + needs: [branch-policy, validate] + + steps: + - name: Trigger RC pre-release + env: + GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} + REPO: ${{ github.repository }} + BRANCH: ${{ github.head_ref }} + GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }} + run: | + curl -s -X POST "${GITEA_URL}/api/v1/repos/${REPO}/actions/workflows/pre-release.yml/dispatches" -H "Authorization: token ${GITEA_TOKEN}" -H "Content-Type: application/json" -d "{\"ref\":\"${BRANCH}\",\"inputs\":{\"stability\":\"release-candidate\"}}" + echo "### Pre-Release" >> $GITHUB_STEP_SUMMARY + echo "Triggered RC build on branch \`${BRANCH}\`" >> $GITHUB_STEP_SUMMARY + + # ── Issue Reporter ────────────────────────────────────────────────────── + report-issues: + name: Report Issues + runs-on: ubuntu-latest + needs: [branch-policy, validate] + if: >- + always() && + needs.validate.result == 'failure' + + steps: + - name: Checkout + uses: actions/checkout@v4 + with: + sparse-checkout: automation/ci-issue-reporter.sh + sparse-checkout-cone-mode: false + + - name: "File issue for PR validation failure" + env: + GITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} + GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }} + run: | + chmod +x automation/ci-issue-reporter.sh + ./automation/ci-issue-reporter.sh \ + --gate "PR Validation" \ + --workflow "PR Check" \ + --severity error \ + --details "PR validation failed (syntax, manifest, changelog, or source checks). See the CI run for the specific check that failed." From 995fc4b591e57ced20eb5988693ec09798080e4a Mon Sep 17 00:00:00 2001 From: Moko Consulting Date: Tue, 2 Jun 2026 21:33:07 +0000 Subject: [PATCH 049/220] chore(ci): sync CI issue reporter from Template-Joomla --- automation/ci-issue-reporter.sh | 237 ++++++++++++++++++++++++++++++++ 1 file changed, 237 insertions(+) create mode 100644 automation/ci-issue-reporter.sh diff --git a/automation/ci-issue-reporter.sh b/automation/ci-issue-reporter.sh new file mode 100644 index 00000000..65c47baf --- /dev/null +++ b/automation/ci-issue-reporter.sh @@ -0,0 +1,237 @@ +#!/usr/bin/env bash +# ============================================================================ +# Copyright (C) 2026 Moko Consulting +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +# FILE INFORMATION +# DEFGROUP: Automation.CI +# INGROUP: moko-platform.Automation +# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform +# PATH: /automation/ci-issue-reporter.sh +# VERSION: 09.23.00 +# BRIEF: Creates or updates a Gitea issue when a CI gate fails. +# Deduplicates by searching open issues with the "ci-auto" label +# whose title matches the gate. If a matching issue exists, a comment +# is appended instead of opening a duplicate. +# ============================================================================ + +set -euo pipefail + +# ── Defaults ──────────────────────────────────────────────────────────────── +GITEA_URL="${GITEA_URL:-https://git.mokoconsulting.tech}" +GITEA_TOKEN="${GITEA_TOKEN:-}" +REPO="${GITHUB_REPOSITORY:-}" +RUN_URL="${GITHUB_SERVER_URL:-${GITEA_URL}}/${REPO}/actions/runs/${GITHUB_RUN_ID:-0}" +LABEL_NAME="ci-auto" +LABEL_COLOR="#e11d48" + +GATE="" +DETAILS="" +SEVERITY="error" +WORKFLOW="" + +# ── Parse arguments ───────────────────────────────────────────────────────── +usage() { + cat </dev/null || echo "000") + + if [[ "$exists" == "200" ]]; then + # Check if label already exists + local found + found=$(curl -sf \ + -H "Authorization: token ${GITEA_TOKEN}" \ + "${API}/labels" 2>/dev/null \ + | grep -o "\"name\":\"${LABEL_NAME}\"" || true) + + if [[ -z "$found" ]]; then + curl -sf -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -H "Content-Type: application/json" \ + "${API}/labels" \ + -d "{\"name\":\"${LABEL_NAME}\",\"color\":\"${LABEL_COLOR}\",\"description\":\"Auto-created by CI issue reporter\"}" \ + > /dev/null 2>&1 || true + fi + fi +} + +# ── Search for existing open issue ────────────────────────────────────────── +find_existing_issue() { + # URL-encode the gate name for the query + local query + query=$(printf '%s' "[CI] ${GATE}" | sed 's/ /%20/g; s/\[/%5B/g; s/\]/%5D/g') + + local response + response=$(curl -sf \ + -H "Authorization: token ${GITEA_TOKEN}" \ + "${API}/issues?type=issues&state=open&labels=${LABEL_NAME}&q=${query}&limit=5" \ + 2>/dev/null || echo "[]") + + # Extract the first matching issue number + echo "$response" \ + | grep -oP '"number":\s*\K[0-9]+' \ + | head -1 +} + +# ── Build issue body ──────────────────────────────────────────────────────── +build_body() { + local severity_badge + if [[ "$SEVERITY" == "error" ]]; then + severity_badge="**Severity:** Error" + else + severity_badge="**Severity:** Warning" + fi + + cat </dev/null) + + HTTP=$(curl -sf -o /dev/null -w '%{http_code}' -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -H "Content-Type: application/json" \ + "${API}/issues/${EXISTING}/comments" \ + -d "${COMMENT_JSON}" 2>/dev/null || echo "000") + + if [[ "$HTTP" == "201" ]]; then + echo "Commented on existing issue #${EXISTING}" + else + echo "WARNING: Failed to comment on issue #${EXISTING} (HTTP ${HTTP})" + fi +else + # Create new issue + ISSUE_BODY=$(build_body) + ISSUE_JSON=$(python3 -c " +import sys, json +body = sys.stdin.read() +print(json.dumps({ + 'title': sys.argv[1], + 'body': body, + 'labels': [] +}))" "$TITLE" <<< "$ISSUE_BODY" 2>/dev/null) + + # Create the issue + RESPONSE=$(curl -sf -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -H "Content-Type: application/json" \ + "${API}/issues" \ + -d "${ISSUE_JSON}" 2>/dev/null || echo "{}") + + ISSUE_NUM=$(echo "$RESPONSE" | grep -oP '"number":\s*\K[0-9]+' | head -1) + + if [[ -n "$ISSUE_NUM" ]]; then + # Apply label (separate call — more reliable across Gitea versions) + LABEL_ID=$(curl -sf \ + -H "Authorization: token ${GITEA_TOKEN}" \ + "${API}/labels" 2>/dev/null \ + | grep -oP "\"id\":\s*\K[0-9]+(?=[^}]*\"name\":\s*\"${LABEL_NAME}\")" \ + | head -1 || true) + + if [[ -n "$LABEL_ID" ]]; then + curl -sf -X POST \ + -H "Authorization: token ${GITEA_TOKEN}" \ + -H "Content-Type: application/json" \ + "${API}/issues/${ISSUE_NUM}/labels" \ + -d "{\"labels\":[${LABEL_ID}]}" \ + > /dev/null 2>&1 || true + fi + + echo "Created issue #${ISSUE_NUM}: ${TITLE}" + else + echo "WARNING: Failed to create issue" + echo "Response: ${RESPONSE}" + fi +fi From 80c2658b063159250eae918820bdf22d17b334a6 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 16:39:06 -0500 Subject: [PATCH 050/220] feat: customer portal - frontend ticket submission and history Frontend (site-side) views for authenticated users: Ticket List (view=tickets): - Shows user's own tickets with status badges - Collapsible new ticket form with category + priority - Redirects guests to login with return URL Ticket Detail (view=ticket): - Conversation thread (excludes internal notes) - Staff replies highlighted with badge - Reply form (disabled for closed/resolved tickets) - User can only see their own tickets Also fixed .gitignore to allow src/packages/*/site/ directories. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitignore | 1 + src/packages/com_mokowaas/mokowaas.xml | 7 + .../site/language/en-GB/com_mokowaas.ini | 11 ++ .../com_mokowaas/site/services/provider.php | 38 +++++ .../site/src/Controller/DisplayController.php | 110 +++++++++++++++ .../site/src/View/Ticket/HtmlView.php | 64 +++++++++ .../site/src/View/Tickets/HtmlView.php | 56 ++++++++ .../com_mokowaas/site/tmpl/ticket/default.php | 126 +++++++++++++++++ .../site/tmpl/tickets/default.php | 133 ++++++++++++++++++ 9 files changed, 546 insertions(+) create mode 100644 src/packages/com_mokowaas/site/language/en-GB/com_mokowaas.ini create mode 100644 src/packages/com_mokowaas/site/services/provider.php create mode 100644 src/packages/com_mokowaas/site/src/Controller/DisplayController.php create mode 100644 src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php create mode 100644 src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php create mode 100644 src/packages/com_mokowaas/site/tmpl/ticket/default.php create mode 100644 src/packages/com_mokowaas/site/tmpl/tickets/default.php diff --git a/.gitignore b/.gitignore index ee502562..e22eb9cb 100644 --- a/.gitignore +++ b/.gitignore @@ -122,6 +122,7 @@ build/ dist/ out/ site/ +!src/packages/*/site/ *.map *.css.map *.js.map diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index e13f7fe9..391a8b8f 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -47,6 +47,13 @@ + + language + services + src + tmpl + + admin/sql/install.mysql.sql diff --git a/src/packages/com_mokowaas/site/language/en-GB/com_mokowaas.ini b/src/packages/com_mokowaas/site/language/en-GB/com_mokowaas.ini new file mode 100644 index 00000000..3047c85e --- /dev/null +++ b/src/packages/com_mokowaas/site/language/en-GB/com_mokowaas.ini @@ -0,0 +1,11 @@ +; MokoWaaS Customer Portal - Language Strings +; Copyright (C) 2026 Moko Consulting. All rights reserved. +; License: GPL-3.0-or-later + +COM_MOKOWAAS_PORTAL_TITLE="Support Portal" +COM_MOKOWAAS_PORTAL_MY_TICKETS="My Support Tickets" +COM_MOKOWAAS_PORTAL_NEW_TICKET="New Ticket" +COM_MOKOWAAS_PORTAL_SUBMIT="Submit Ticket" +COM_MOKOWAAS_PORTAL_REPLY="Send Reply" +COM_MOKOWAAS_PORTAL_NO_TICKETS="You haven't submitted any support tickets yet." +COM_MOKOWAAS_PORTAL_LOGIN_REQUIRED="Please log in to access the support portal." diff --git a/src/packages/com_mokowaas/site/services/provider.php b/src/packages/com_mokowaas/site/services/provider.php new file mode 100644 index 00000000..cb74ca34 --- /dev/null +++ b/src/packages/com_mokowaas/site/services/provider.php @@ -0,0 +1,38 @@ +registerServiceProvider(new MVCFactory('\\Moko\\Component\\MokoWaaS')); + $container->registerServiceProvider(new ComponentDispatcherFactory('\\Moko\\Component\\MokoWaaS')); + + $container->set( + ComponentInterface::class, + function (Container $container) { + $component = new \Joomla\CMS\Extension\MVCComponent( + $container->get(ComponentDispatcherFactoryInterface::class) + ); + $component->setMVCFactory($container->get(MVCFactoryInterface::class)); + + return $component; + } + ); + } +}; diff --git a/src/packages/com_mokowaas/site/src/Controller/DisplayController.php b/src/packages/com_mokowaas/site/src/Controller/DisplayController.php new file mode 100644 index 00000000..15a90e63 --- /dev/null +++ b/src/packages/com_mokowaas/site/src/Controller/DisplayController.php @@ -0,0 +1,110 @@ +getIdentity(); + + if ($user->guest) + { + Factory::getApplication()->enqueueMessage('Please log in to access the support portal.', 'warning'); + Factory::getApplication()->redirect(Route::_('index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_mokowaas&view=tickets'), false)); + + return; + } + + return parent::display($cachable, $urlparams); + } + + /** + * Submit a new ticket from frontend. + */ + public function submitTicket() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $user = Factory::getApplication()->getIdentity(); + + if ($user->guest) + { + $this->jsonResponse(['success' => false, 'message' => 'Please log in.']); + } + + $app = Factory::getApplication(); + $input = $app->getInput(); + + // Use admin model for ticket creation + $model = $this->getModel('Tickets', 'Administrator'); + + $result = $model->createTicket([ + 'subject' => $input->getString('subject', ''), + 'body' => $input->getRaw('body', ''), + 'priority' => $input->getString('priority', 'normal'), + 'category_id' => $input->getInt('category_id', 0), + ]); + + $this->jsonResponse($result); + } + + /** + * Submit a reply from frontend. + */ + public function submitReply() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $user = Factory::getApplication()->getIdentity(); + + if ($user->guest) + { + $this->jsonResponse(['success' => false, 'message' => 'Please log in.']); + } + + $input = Factory::getApplication()->getInput(); + $model = $this->getModel('Tickets', 'Administrator'); + + // Verify user owns this ticket + $ticketId = $input->getInt('ticket_id', 0); + $ticket = $model->getTicket($ticketId); + + if (!$ticket || (int) $ticket->created_by !== $user->id) + { + $this->jsonResponse(['success' => false, 'message' => 'Ticket not found.']); + } + + $result = $model->addReply( + $ticketId, + $input->getRaw('body', ''), + false + ); + + $this->jsonResponse($result); + } + + private function jsonResponse(array $data): void + { + $app = Factory::getApplication(); + $app->setHeader('Content-Type', 'application/json'); + echo json_encode($data); + $app->close(); + } +} diff --git a/src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php b/src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php new file mode 100644 index 00000000..c5a929f4 --- /dev/null +++ b/src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php @@ -0,0 +1,64 @@ +get('Joomla\Database\DatabaseInterface'); + $user = Factory::getApplication()->getIdentity(); + $id = Factory::getApplication()->getInput()->getInt('id', 0); + + // Get ticket — only if owned by this user + $query = $db->getQuery(true) + ->select([ + $db->quoteName('t') . '.*', + $db->quoteName('c.title', 'category_title'), + ]) + ->from($db->quoteName('#__mokowaas_tickets', 't')) + ->leftJoin($db->quoteName('#__mokowaas_ticket_categories', 'c') . ' ON c.id = t.category_id') + ->where($db->quoteName('t.id') . ' = ' . $id) + ->where($db->quoteName('t.created_by') . ' = ' . (int) $user->id); + $db->setQuery($query); + $this->ticket = $db->loadObject(); + + if (!$this->ticket) + { + Factory::getApplication()->enqueueMessage('Ticket not found.', 'error'); + Factory::getApplication()->redirect(Route::_('index.php?option=com_mokowaas&view=tickets', false)); + + return; + } + + // Load replies (exclude internal notes) + $query = $db->getQuery(true) + ->select([ + $db->quoteName('r') . '.*', + $db->quoteName('u.name', 'user_name'), + ]) + ->from($db->quoteName('#__mokowaas_ticket_replies', 'r')) + ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = r.user_id') + ->where($db->quoteName('r.ticket_id') . ' = ' . $id) + ->where($db->quoteName('r.is_internal') . ' = 0') + ->order($db->quoteName('r.created') . ' ASC'); + $db->setQuery($query); + $this->ticket->replies = $db->loadObjectList() ?: []; + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php b/src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php new file mode 100644 index 00000000..933e5c55 --- /dev/null +++ b/src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php @@ -0,0 +1,56 @@ +get('Joomla\Database\DatabaseInterface'); + $user = Factory::getApplication()->getIdentity(); + + // Get user's tickets + $query = $db->getQuery(true) + ->select([ + $db->quoteName('t.id'), + $db->quoteName('t.subject'), + $db->quoteName('t.status'), + $db->quoteName('t.priority'), + $db->quoteName('t.created'), + $db->quoteName('t.modified'), + $db->quoteName('c.title', 'category_title'), + ]) + ->from($db->quoteName('#__mokowaas_tickets', 't')) + ->leftJoin($db->quoteName('#__mokowaas_ticket_categories', 'c') . ' ON c.id = t.category_id') + ->where($db->quoteName('t.created_by') . ' = ' . (int) $user->id) + ->order($db->quoteName('t.created') . ' DESC') + ->setLimit(50); + $db->setQuery($query); + $this->tickets = $db->loadObjectList() ?: []; + + // Get categories for new ticket form + $query = $db->getQuery(true) + ->select([$db->quoteName('id'), $db->quoteName('title')]) + ->from($db->quoteName('#__mokowaas_ticket_categories')) + ->where($db->quoteName('published') . ' = 1') + ->order($db->quoteName('ordering') . ' ASC'); + $db->setQuery($query); + $this->categories = $db->loadObjectList() ?: []; + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/site/tmpl/ticket/default.php b/src/packages/com_mokowaas/site/tmpl/ticket/default.php new file mode 100644 index 00000000..5c6d135d --- /dev/null +++ b/src/packages/com_mokowaas/site/tmpl/ticket/default.php @@ -0,0 +1,126 @@ +ticket; +$token = Session::getFormToken(); + +$statusLabel = [ + 'open' => 'Open', 'in_progress' => 'In Progress', 'waiting' => 'Awaiting Your Response', + 'resolved' => 'Resolved', 'closed' => 'Closed', +]; +$statusClass = [ + 'open' => 'primary', 'in_progress' => 'info', 'waiting' => 'warning', + 'resolved' => 'success', 'closed' => 'secondary', +]; +?> + +
+
+ + Back to My Tickets + +
+ + +
+
+
+
+

#id; ?> — subject); ?>

+ + category_title ?? 'General'); ?> + · Submitted created, 'M d, Y \a\t H:i'); ?> + · Priority: priority); ?> + +
+ + status] ?? ucfirst($t->status); ?> + +
+
+
+ + +
+
+ You + created, 'M d, Y H:i'); ?> +
+
body)); ?>
+
+ + + replies as $reply): ?> + user_id !== (int) $t->created_by); + ?> +
+
+
+ user_name ?? 'Support'); ?> + + Staff + + created, 'M d, Y H:i'); ?> +
+
+
body)); ?>
+
+ + + + status, ['closed', 'resolved'])): ?> +
+
+
Reply
+ +
+ +
+ + + + +
+
+ +
+ This ticket is status] ?? $t->status); ?>. If you need further help, please open a new ticket. +
+ +
+ + diff --git a/src/packages/com_mokowaas/site/tmpl/tickets/default.php b/src/packages/com_mokowaas/site/tmpl/tickets/default.php new file mode 100644 index 00000000..f9face45 --- /dev/null +++ b/src/packages/com_mokowaas/site/tmpl/tickets/default.php @@ -0,0 +1,133 @@ +tickets; +$categories = $this->categories; +$token = Session::getFormToken(); + +$statusLabel = [ + 'open' => 'Open', 'in_progress' => 'In Progress', 'waiting' => 'Awaiting Response', + 'resolved' => 'Resolved', 'closed' => 'Closed', +]; +$statusClass = [ + 'open' => 'primary', 'in_progress' => 'info', 'waiting' => 'warning', + 'resolved' => 'success', 'closed' => 'secondary', +]; +?> + +
+
+

My Support Tickets

+ +
+ + +
+
+
+
Submit a Support Request
+
+
+ + +
+
+
+ + +
+
+ + +
+
+
+ + +
+ + +
+
+
+
+ + + +
+ + You haven't submitted any support tickets yet. Click "New Ticket" above to get started. +
+ +
+ + +
+
+
#id; ?> — subject); ?>
+ + category_title ?? 'General'); ?> + · created, 'M d, Y'); ?> + +
+
+ + status] ?? ucfirst($t->status); ?> + +
+ priority); ?> +
+
+ + +
+ +
+ + From b37120341f5fdc806e7320f8c32edfbf21472154 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 16:47:21 -0500 Subject: [PATCH 051/220] feat: auto-create Support menu item on package install MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Creates a frontend menu item at /support pointing to the customer portal (com_mokowaas&view=tickets). Access level: Registered. Idempotent — skips if already exists. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/script.php | 79 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/src/script.php b/src/script.php index c6a598c1..5afdddef 100644 --- a/src/script.php +++ b/src/script.php @@ -54,6 +54,9 @@ class Pkg_MokowaasInstallerScript // Set up cpanel module on the admin dashboard $this->setupCpanelModule(); + // Create Support portal menu item on frontend + $this->setupSupportMenuItem(); + // Mark MokoWaaS extensions as protected (prevents disable/uninstall at framework level) $this->protectExtensions(); @@ -699,6 +702,82 @@ class Pkg_MokowaasInstallerScript } } + /** + * Create a "Support" menu item on the frontend main menu. + */ + private function setupSupportMenuItem(): void + { + try + { + $db = Factory::getDbo(); + + $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__menu')) + ->where($db->quoteName('link') . ' LIKE ' . $db->quote('%com_mokowaas&view=tickets%')) + ->where($db->quoteName('client_id') . ' = 0') + ); + + if ((int) $db->loadResult() > 0) + { + return; + } + + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('extension_id')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + ); + $componentId = (int) $db->loadResult(); + + if (!$componentId) + { + return; + } + + $db->setQuery("SELECT id FROM #__menu WHERE menutype = '' AND level = 0 AND client_id = 0 LIMIT 1"); + $rootId = (int) $db->loadResult() ?: 1; + + $db->setQuery('SELECT MAX(rgt) FROM #__menu WHERE client_id = 0'); + $maxRgt = (int) $db->loadResult(); + + $item = (object) [ + 'menutype' => 'mainmenu', + 'title' => 'Support', + 'alias' => 'support', + 'note' => '', + 'path' => 'support', + 'link' => 'index.php?option=com_mokowaas&view=tickets', + 'type' => 'component', + 'published' => 1, + 'parent_id' => $rootId, + 'level' => 1, + 'component_id' => $componentId, + 'checked_out' => null, + 'checked_out_time' => null, + 'browserNav' => 0, + 'access' => 2, + 'img' => '', + 'template_style_id' => 0, + 'params' => '{}', + 'lft' => $maxRgt + 1, + 'rgt' => $maxRgt + 2, + 'home' => 0, + 'language' => '*', + 'client_id' => 0, + ]; + + $db->insertObject('#__menu', $item, 'id'); + } + catch (\Throwable $e) + { + Log::add('Support menu setup error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + /** * One-time migration of params from the monolithic core plugin to * the new feature plugins. Copies security, tenant, and dev params. From ce047016164b84c23a143429aca66fdb5f8535fd Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Tue, 2 Jun 2026 21:51:27 +0000 Subject: [PATCH 052/220] chore: sync .mokogitea/workflows/pr-check.yml from moko-platform [skip ci] --- .mokogitea/workflows/pr-check.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.mokogitea/workflows/pr-check.yml b/.mokogitea/workflows/pr-check.yml index e2c82ef2..0ac0ef11 100644 --- a/.mokogitea/workflows/pr-check.yml +++ b/.mokogitea/workflows/pr-check.yml @@ -105,6 +105,19 @@ jobs: - name: Checkout uses: actions/checkout@v4 + - name: Check for merge conflict markers + run: | + CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true) + if [ -n "$CONFLICTS" ]; then + echo "::error::Merge conflict markers found in source files" + echo "## Conflict Markers Found" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + exit 1 + fi + echo "No conflict markers found" + - name: Detect platform id: platform run: | From 4a18318cb9eb482a2a57c56e53db92b6798280a4 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 18:46:12 -0500 Subject: [PATCH 053/220] feat: search KB before submitting ticket (frontend + backend) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Both frontend and admin ticket creation now show a KB search step first. User types their issue, Smart Search (com_finder) returns matching articles. If nothing helps, they click through to the ticket form with the search query pre-filled as the subject. Frontend (/support/submit-ticket): - Search input with live results from #__finder_links - Article links open in new tab - "Submit Anyway" shows the ticket form - Falls back to direct form if Smart Search has no indexed content Admin (New Ticket modal): - Same KB search step before the form - Results as clickable list-group items - Modal resets on close Also: - Added searchKb controller task (both frontend + admin) - Added "Submit a Ticket" child menu item under Support on install - Fixed innerHTML → safe DOM methods for search results Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Controller/DisplayController.php | 42 ++++ .../admin/tmpl/tickets/default.php | 117 ++++++++-- .../site/src/Controller/DisplayController.php | 167 ++++++++++++-- .../com_mokowaas/site/tmpl/tickets/submit.php | 204 ++++++++++++++++++ src/script.php | 36 ++++ 5 files changed, 528 insertions(+), 38 deletions(-) create mode 100644 src/packages/com_mokowaas/site/tmpl/tickets/submit.php diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index fe5e1a88..01ca5a98 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -226,6 +226,48 @@ class DisplayController extends BaseController )); } + // ================================================================== + // KB Search + // ================================================================== + + public function searchKb() + { + $query = Factory::getApplication()->getInput()->getString('q', ''); + + if (strlen($query) < 3) + { + $this->jsonResponse(['results' => []]); + } + + try + { + $db = Factory::getDbo(); + $escaped = $db->quote('%' . $db->escape($query, true) . '%'); + + $results = $db->setQuery( + $db->getQuery(true) + ->select([$db->quoteName('l.title'), $db->quoteName('l.url'), $db->quoteName('l.description')]) + ->from($db->quoteName('#__finder_links', 'l')) + ->where($db->quoteName('l.published') . ' = 1') + ->where('(' . $db->quoteName('l.title') . ' LIKE ' . $escaped + . ' OR ' . $db->quoteName('l.description') . ' LIKE ' . $escaped . ')') + ->order($db->quoteName('l.title') . ' ASC') + ->setLimit(8) + )->loadObjectList() ?: []; + + foreach ($results as $r) + { + $r->description = mb_substr(strip_tags($r->description ?? ''), 0, 150); + } + + $this->jsonResponse(['results' => $results]); + } + catch (\Throwable $e) + { + $this->jsonResponse(['results' => []]); + } + } + // ================================================================== // Importers // ================================================================== diff --git a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php index 8b3a241e..5d40328b 100644 --- a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php @@ -135,11 +135,25 @@ $priorityBadge = [
New Ticket
-
-
+
+ + + + +
- +
@@ -165,28 +179,93 @@ $priorityBadge = [
-
-
- - -
- +
+ + +
+ +
diff --git a/src/script.php b/src/script.php index 5afdddef..7afd3b8c 100644 --- a/src/script.php +++ b/src/script.php @@ -771,6 +771,42 @@ class Pkg_MokowaasInstallerScript ]; $db->insertObject('#__menu', $item, 'id'); + $supportId = (int) $item->id; + + // Create "Submit a Ticket" child menu item + if ($supportId) + { + $db->setQuery('SELECT MAX(rgt) FROM #__menu WHERE client_id = 0'); + $maxRgt2 = (int) $db->loadResult(); + + $child = (object) [ + 'menutype' => 'mainmenu', + 'title' => 'Submit a Ticket', + 'alias' => 'submit-ticket', + 'note' => '', + 'path' => 'support/submit-ticket', + 'link' => 'index.php?option=com_mokowaas&view=tickets&layout=submit', + 'type' => 'component', + 'published' => 1, + 'parent_id' => $supportId, + 'level' => 2, + 'component_id' => $componentId, + 'checked_out' => null, + 'checked_out_time' => null, + 'browserNav' => 0, + 'access' => 2, + 'img' => '', + 'template_style_id' => 0, + 'params' => '{}', + 'lft' => $maxRgt2 + 1, + 'rgt' => $maxRgt2 + 2, + 'home' => 0, + 'language' => '*', + 'client_id' => 0, + ]; + + $db->insertObject('#__menu', $child, 'id'); + } } catch (\Throwable $e) { From fd6c79d3a2fa1303a5cb70249251251a5e671415 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 23:46:30 +0000 Subject: [PATCH 054/220] chore(version): auto-bump 02.32.36 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 2572b83b..30095f8b 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.35 + 02.32.36 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index cb6bbaba..d689b2da 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.35 +# VERSION: 02.32.36 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index b9c76fb2..edd9c8df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.35 + VERSION: 02.32.36 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index cae67402..db283c68 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 37185d1c..8acbd856 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 15e4be4c..23d7ef81 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.35 + VERSION: 02.32.36 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index e3e2e3d7..1b864ced 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index b4ffecc0..c7ffa0dd 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.35 +VERSION: 02.32.36 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index cc0002ff..3d214476 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.35) +# MokoWaaS Build Guide (VERSION: 02.32.36) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 07c03445..92eea908 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.35) +# MokoWaaS Configuration Guide (VERSION: 02.32.36) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index e7dbaaee..98021ddb 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.35) +# MokoWaaS Installation Guide (VERSION: 02.32.36) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 8243c0fa..0c0e0230 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.35) +# MokoWaaS Operations Guide (VERSION: 02.32.36) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 954545ab..fea5af83 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.35) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.36) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 1152078d..0ea0eb3b 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.35) +# MokoWaaS Testing Guide (VERSION: 02.32.36) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 25902a89..5b6a3892 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.35) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.36) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index fe439e9c..fb050844 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.35) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.36) ## Introduction diff --git a/docs/index.md b/docs/index.md index 83dea726..fbfcdcf2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.35 + VERSION: 02.32.36 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.35) +# MokoWaaS Documentation Index (VERSION: 02.32.36) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 784df7d7..7f08c682 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.35 + VERSION: 02.32.36 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.35) +# MokoWaaS Plugin Overview (VERSION: 02.32.36) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 083c0784..8efbe3b6 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.35 +VERSION: 02.32.36 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index bdd309d4..2f50b935 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 112c94ab..a7da2b4d 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 73785e8a..635d09e0 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index dcc2e192..8a27cc8e 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index aabbf7da..bff139e0 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index cdeb1db5..966c5b49 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 9265a9b2..0ea18a7c 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index a1da1121..dcbb7f76 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 36814c14..0da36af4 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 8f3ff5f8..f0f65df6 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.35 + * VERSION: 02.32.36 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index a583d777..66238506 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.35 + * VERSION: 02.32.36 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index f4b62efc..0145742a 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.35 + * VERSION: 02.32.36 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index a42360a2..e80c9745 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 69e2247d..ed34f452 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index cc943fb5..a118ce5c 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.35 + * VERSION: 02.32.36 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 85a62e4b..2003509b 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 79de3774..333fdb66 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 25e18837..f47078c2 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index ebf38326..41eac267 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 74a5c23c..c3ab49c7 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 2b012e12..6fe5a133 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 - 02.32.35 + 02.32.36 + 02.32.36 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index c8fbe7b5..d64a96d6 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 + 02.32.36 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index edb05252..94327d3d 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 - 02.32.35 + 02.32.36 + 02.32.36 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 1486d32a..c7ceee64 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.35 - 02.32.35 + 02.32.36 + 02.32.36 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index a50ba24c..eada063c 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.35 + * VERSION: 02.32.36 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 9b0f543d..7ec9ac2f 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.35 + * VERSION: 02.32.36 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index f7b6e626..a5eb97a8 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.35 + 02.32.36 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index e2d46625..b947f7b3 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From b8fbb0d1d66f2d079c2cb911deb0d06258028b95 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 23:46:31 +0000 Subject: [PATCH 055/220] chore: update development channel 02.32.36 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index b947f7b3..2a0773f6 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.35-dev + 02.32.36-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.35-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.36-dev.zip - 6dc0bc62259de6bd62963a7d663e2aa80d5c0a69a1fd430f5a4a489f794afe34 + d8c4739ac985757071eb0dd00d8ea3b64af7b53d9d18a4654fedcc83ffb24d1b dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 756c2bff32c434961a35d0abe5ebe7a083746cca Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Tue, 2 Jun 2026 23:47:10 +0000 Subject: [PATCH 056/220] chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] --- .mokogitea/workflows/auto-release.yml | 555 +++++++++++++------------- 1 file changed, 283 insertions(+), 272 deletions(-) diff --git a/.mokogitea/workflows/auto-release.yml b/.mokogitea/workflows/auto-release.yml index 0b771b67..2325032b 100644 --- a/.mokogitea/workflows/auto-release.yml +++ b/.mokogitea/workflows/auto-release.yml @@ -1,272 +1,283 @@ -# Copyright (C) 2026 Moko Consulting -# -# SPDX-License-Identifier: GPL-3.0-or-later -# -# FILE INFORMATION -# DEFGROUP: Gitea.Workflow -# INGROUP: moko-platform.Release -# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform -# PATH: /templates/workflows/universal/auto-release.yml.template -# VERSION: 09.23.00 -# BRIEF: Universal build & release � detects platform from manifest.xml -# -# +========================================================================+ -# | UNIVERSAL BUILD & RELEASE PIPELINE | -# +========================================================================+ -# | | -# | Reads manifest.xml (joomla|dolibarr|generic) to branch logic. | -# | | -# | Platform-specific: | -# | joomla: XML manifest, updates.xml, type-prefixed packages | -# | dolibarr: mod*.class.php, update.txt, dev version reset | -# | generic: README-only, no update stream | -# | | -# +========================================================================+ - -name: "Universal: Build & Release" - -on: - pull_request: - types: [opened, closed] - branches: - - main - workflow_dispatch: - inputs: - action: - description: 'Action to perform' - required: false - type: choice - default: release - options: - - release - - promote-rc - -env: - FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true - GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }} - GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }} - GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }} - -permissions: - contents: write - -jobs: - # ── PR Opened → Rename branch to RC and build RC release ───────────────────── - promote-rc: - name: Promote to RC - runs-on: release - if: >- - (github.event.action == 'opened' && github.event.pull_request.merged != true) || - (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc') - - steps: - - name: Checkout repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - with: - token: ${{ secrets.MOKOGITEA_TOKEN }} - fetch-depth: 1 - submodules: recursive - - - name: Setup moko-platform tools - env: - MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} - MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting - run: | - if ! command -v composer &> /dev/null; then - sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 - fi - # Always fetch latest CLI tools — never use stale cache from previous runs - rm -rf /tmp/moko-platform-api - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ - /tmp/moko-platform-api - cd /tmp/moko-platform-api - composer install --no-dev --no-interaction --quiet - - - name: Rename branch to rc - run: | - php /tmp/moko-platform-api/cli/branch_rename.php \ - --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \ - --token "${{ secrets.MOKOGITEA_TOKEN }}" \ - --api-base "${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \ - --pr "${{ github.event.pull_request.number }}" - - - name: Checkout rc and configure git - run: | - git fetch origin rc - git checkout rc - git config --local user.email "gitea-actions[bot]@mokoconsulting.tech" - git config --local user.name "gitea-actions[bot]" - git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git" - - - name: Publish RC release - run: | - php /tmp/moko-platform-api/cli/release_publish.php \ - --path . --stability rc --bump minor --branch rc \ - --token "${{ secrets.MOKOGITEA_TOKEN }}" - - - name: Summary - if: always() - run: | - echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY - echo "Branch renamed to rc, minor bump, RC + lesser stream releases built, updates.xml synced" >> $GITHUB_STEP_SUMMARY - - # ── Merged PR → Build & Release (or promote RC to stable) ──────────────────── - release: - name: Build & Release Pipeline - runs-on: release - if: >- - github.event.pull_request.merged == true || - (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc') - - steps: - - name: Checkout repository - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - with: - token: ${{ secrets.MOKOGITEA_TOKEN }} - fetch-depth: 0 - submodules: recursive - - - name: Configure git for bot pushes - run: | - git config --local user.email "gitea-actions[bot]@mokoconsulting.tech" - git config --local user.name "gitea-actions[bot]" - git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git" - - - name: Setup moko-platform tools - env: - MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} - MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting - COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}' - run: | - # Ensure PHP + Composer are available - if ! command -v composer &> /dev/null; then - sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 - fi - # Always fetch latest CLI tools — never use stale cache from previous runs - rm -rf /tmp/moko-platform-api - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ - /tmp/moko-platform-api - cd /tmp/moko-platform-api - composer install --no-dev --no-interaction --quiet - - - - name: "Publish stable release" - run: | - php /tmp/moko-platform-api/cli/release_publish.php \ - --path . --stability stable --bump minor --branch main \ - --token "${{ secrets.MOKOGITEA_TOKEN }}" - - # -- STEP 9: Mirror to GitHub (stable only) -------------------------------- - - name: "Step 9: Mirror release to GitHub" - if: >- - steps.version.outputs.skip != 'true' && - secrets.GH_MIRROR_TOKEN != '' - continue-on-error: true - run: | - VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}" - RELEASE_TAG="${{ steps.version.outputs.release_tag }}" - GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}" - API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" - php /tmp/moko-platform-api/cli/release_mirror.php \ - --version "$VERSION" --tag "$RELEASE_TAG" \ - --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \ - --gh-token "${{ secrets.GH_MIRROR_TOKEN }}" --gh-repo "$GH_REPO" \ - --branch main 2>&1 || true - echo "GitHub mirror updated" >> $GITHUB_STEP_SUMMARY - - # -- STEP 10: Sync main branch to GitHub mirror ---------------------------- - - name: "Step 10: Push main to GitHub mirror" - if: >- - steps.version.outputs.skip != 'true' && - secrets.GH_MIRROR_TOKEN != '' - continue-on-error: true - run: | - GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}" - GH_ORG=$(echo "$GH_REPO" | cut -d/ -f1) - GH_NAME=$(echo "$GH_REPO" | cut -d/ -f2) - git remote add github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git" 2>/dev/null || \ - git remote set-url github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git" - git fetch origin main --depth=1 - git push github origin/main:refs/heads/main --force 2>/dev/null \ - && echo "main branch pushed to GitHub mirror" \ - || echo "WARNING: GitHub mirror push failed" - - - name: "Step 11: Delete rc branch and recreate dev from main" - if: steps.version.outputs.skip != 'true' - continue-on-error: true - run: | - API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" - TOKEN="${{ secrets.MOKOGITEA_TOKEN }}" - - # Delete rc branch (ephemeral — created by promote-rc) - curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \ - "${API_BASE}/branches/rc" 2>/dev/null \ - && echo "Deleted rc branch" || echo "rc branch not found" - - # Delete dev branch - curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \ - "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch" - - # Recreate dev from main (now includes version bump + changelog promotion) - curl -sf -X POST -H "Authorization: token ${TOKEN}" \ - -H "Content-Type: application/json" \ - "${API_BASE}/branches" \ - -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Recreated dev from main" - - echo "Pre-release branches cleaned, dev reset from main" >> $GITHUB_STEP_SUMMARY - - - name: "Step 12: Create version branch from main" - if: steps.version.outputs.skip != 'true' - continue-on-error: true - run: | - API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" - TOKEN="${{ secrets.MOKOGITEA_TOKEN }}" - VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}" - BRANCH_NAME="version/${VERSION}" - MAIN_SHA=$(git rev-parse HEAD) - - # Delete old version branch if it exists (same version re-release) - curl -sf -X DELETE -H "Authorization: token ${TOKEN}" "${API_BASE}/branches/${BRANCH_NAME}" 2>/dev/null && echo "Deleted old ${BRANCH_NAME}" - - # Create version/XX.YY.ZZ from main - curl -sf -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" "${API_BASE}/branches" -d "{\"new_branch_name\":\"${BRANCH_NAME}\",\"old_branch_name\":\"main\"}" 2>/dev/null && echo "Created ${BRANCH_NAME} from main (${MAIN_SHA})" || echo "WARNING: ${BRANCH_NAME} creation failed" - - echo "Version branch created: ${BRANCH_NAME} (${MAIN_SHA})" >> $GITHUB_STEP_SUMMARY - - - - # -- Dolibarr post-release: Reset dev version ----------------------------- - - name: "Post-release: Reset dev version" - if: steps.version.outputs.skip != 'true' - continue-on-error: true - run: | - API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" - php /tmp/moko-platform-api/cli/version_reset_dev.php \ - --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \ - --branch dev --path . 2>&1 || true - - # -- Summary -------------------------------------------------------------- - - name: Pipeline Summary - if: always() - run: | - VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}" - PLATFORM="${{ steps.platform.outputs.platform }}" - if [ "${{ steps.version.outputs.skip }}" = "true" ]; then - echo "## Release Skipped" >> $GITHUB_STEP_SUMMARY - echo "No VERSION in README.md" >> $GITHUB_STEP_SUMMARY - elif [ "${{ steps.check.outputs.already_released }}" = "true" ]; then - echo "## Already Released — ${VERSION}" >> $GITHUB_STEP_SUMMARY - else - echo "" >> $GITHUB_STEP_SUMMARY - echo "## Build & Release Complete (${PLATFORM})" >> $GITHUB_STEP_SUMMARY - echo "" >> $GITHUB_STEP_SUMMARY - echo "| Step | Result |" >> $GITHUB_STEP_SUMMARY - echo "|------|--------|" >> $GITHUB_STEP_SUMMARY - echo "| Platform | \`${PLATFORM}\` |" >> $GITHUB_STEP_SUMMARY - echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY - echo "| Branch | \`${{ steps.version.outputs.branch }}\` |" >> $GITHUB_STEP_SUMMARY - echo "| Tag | \`${{ steps.version.outputs.tag }}\` |" >> $GITHUB_STEP_SUMMARY - echo "| Release | [View](${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${{ steps.version.outputs.tag }}) |" >> $GITHUB_STEP_SUMMARY - fi +# Copyright (C) 2026 Moko Consulting +# +# SPDX-License-Identifier: GPL-3.0-or-later +# +# FILE INFORMATION +# DEFGROUP: Gitea.Workflow +# INGROUP: moko-platform.Release +# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform +# PATH: /templates/workflows/universal/auto-release.yml.template +# VERSION: 05.00.00 +# BRIEF: Universal build & release � detects platform from manifest.xml +# +# +========================================================================+ +# | UNIVERSAL BUILD & RELEASE PIPELINE | +# +========================================================================+ +# | | +# | Reads manifest.xml (joomla|dolibarr|generic) to branch logic. | +# | | +# | Platform-specific: | +# | joomla: XML manifest, updates.xml, type-prefixed packages | +# | dolibarr: mod*.class.php, update.txt, dev version reset | +# | generic: README-only, no update stream | +# | | +# +========================================================================+ + +name: "Universal: Build & Release" + +on: + pull_request: + types: [opened, closed] + branches: + - main + workflow_dispatch: + inputs: + action: + description: 'Action to perform' + required: false + type: choice + default: release + options: + - release + - promote-rc + +env: + FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true + GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }} + GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }} + GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }} + +permissions: + contents: write + +jobs: + # ── PR Opened → Rename branch to RC and build RC release ───────────────────── + promote-rc: + name: Promote to RC + runs-on: release + if: >- + (github.event.action == 'opened' && github.event.pull_request.merged != true) || + (github.event_name == 'workflow_dispatch' && inputs.action == 'promote-rc') + + steps: + - name: Checkout repository + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + token: ${{ secrets.MOKOGITEA_TOKEN }} + fetch-depth: 1 + + - name: Setup moko-platform tools + env: + MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} + MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting + run: | + if ! command -v composer &> /dev/null; then + sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 + fi + # Always fetch latest CLI tools — never use stale cache from previous runs + rm -rf /tmp/moko-platform-api + git clone --depth 1 --branch main --quiet \ + "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ + /tmp/moko-platform-api + cd /tmp/moko-platform-api + composer install --no-dev --no-interaction --quiet + + - name: Rename branch to rc + run: | + php /tmp/moko-platform-api/cli/branch_rename.php \ + --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \ + --token "${{ secrets.MOKOGITEA_TOKEN }}" \ + --api-base "${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \ + --pr "${{ github.event.pull_request.number }}" + + - name: Checkout rc and configure git + run: | + git fetch origin rc + git checkout rc + git config --local user.email "gitea-actions[bot]@mokoconsulting.tech" + git config --local user.name "gitea-actions[bot]" + git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git" + + - name: Publish RC release + run: | + php /tmp/moko-platform-api/cli/release_publish.php \ + --path . --stability rc --bump minor --branch rc \ + --token "${{ secrets.MOKOGITEA_TOKEN }}" + + - name: Summary + if: always() + run: | + echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY + echo "Branch renamed to rc, minor bump, RC + lesser stream releases built, updates.xml synced" >> $GITHUB_STEP_SUMMARY + + # ── Merged PR → Build & Release (or promote RC to stable) ──────────────────── + release: + name: Build & Release Pipeline + runs-on: release + if: >- + github.event.pull_request.merged == true || + (github.event_name == 'workflow_dispatch' && inputs.action != 'promote-rc') + + steps: + - name: Checkout repository + uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 + with: + token: ${{ secrets.MOKOGITEA_TOKEN }} + fetch-depth: 0 + + - name: Configure git for bot pushes + run: | + git config --local user.email "gitea-actions[bot]@mokoconsulting.tech" + git config --local user.name "gitea-actions[bot]" + git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git" + + - name: Check for merge conflict markers + run: | + CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true) + if [ -n "$CONFLICTS" ]; then + echo "::error::Merge conflict markers found — aborting release" + echo "## Release Blocked: Conflict Markers" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY + echo '```' >> $GITHUB_STEP_SUMMARY + exit 1 + fi + echo "No conflict markers found" + + - name: Setup moko-platform tools + env: + MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} + MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting + COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}' + run: | + # Ensure PHP + Composer are available + if ! command -v composer &> /dev/null; then + sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 + fi + # Always fetch latest CLI tools — never use stale cache from previous runs + rm -rf /tmp/moko-platform-api + git clone --depth 1 --branch main --quiet \ + "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ + /tmp/moko-platform-api + cd /tmp/moko-platform-api + composer install --no-dev --no-interaction --quiet + + + - name: "Publish stable release" + run: | + php /tmp/moko-platform-api/cli/release_publish.php \ + --path . --stability stable --bump minor --branch main \ + --token "${{ secrets.MOKOGITEA_TOKEN }}" + + # -- STEP 9: Mirror to GitHub (stable only) -------------------------------- + - name: "Step 9: Mirror release to GitHub" + if: >- + steps.version.outputs.skip != 'true' && + secrets.GH_MIRROR_TOKEN != '' + continue-on-error: true + run: | + VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}" + RELEASE_TAG="${{ steps.version.outputs.release_tag }}" + GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}" + API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" + php /tmp/moko-platform-api/cli/release_mirror.php \ + --version "$VERSION" --tag "$RELEASE_TAG" \ + --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \ + --gh-token "${{ secrets.GH_MIRROR_TOKEN }}" --gh-repo "$GH_REPO" \ + --branch main 2>&1 || true + echo "GitHub mirror updated" >> $GITHUB_STEP_SUMMARY + + # -- STEP 10: Sync main branch to GitHub mirror ---------------------------- + - name: "Step 10: Push main to GitHub mirror" + if: >- + steps.version.outputs.skip != 'true' && + secrets.GH_MIRROR_TOKEN != '' + continue-on-error: true + run: | + GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}" + GH_ORG=$(echo "$GH_REPO" | cut -d/ -f1) + GH_NAME=$(echo "$GH_REPO" | cut -d/ -f2) + git remote add github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git" 2>/dev/null || \ + git remote set-url github "https://x-access-token:${{ secrets.GH_MIRROR_TOKEN }}@github.com/${GH_ORG}/${GH_NAME}.git" + git fetch origin main --depth=1 + git push github origin/main:refs/heads/main --force 2>/dev/null \ + && echo "main branch pushed to GitHub mirror" \ + || echo "WARNING: GitHub mirror push failed" + + - name: "Step 11: Delete rc branch and recreate dev from main" + if: steps.version.outputs.skip != 'true' + continue-on-error: true + run: | + API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" + TOKEN="${{ secrets.MOKOGITEA_TOKEN }}" + + # Delete rc branch (ephemeral — created by promote-rc) + curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \ + "${API_BASE}/branches/rc" 2>/dev/null \ + && echo "Deleted rc branch" || echo "rc branch not found" + + # Delete dev branch + curl -sf -X DELETE -H "Authorization: token ${TOKEN}" \ + "${API_BASE}/branches/dev" 2>/dev/null && echo "Deleted dev branch" + + # Recreate dev from main (now includes version bump + changelog promotion) + curl -sf -X POST -H "Authorization: token ${TOKEN}" \ + -H "Content-Type: application/json" \ + "${API_BASE}/branches" \ + -d '{"new_branch_name":"dev","old_branch_name":"main"}' 2>/dev/null && echo "Recreated dev from main" + + echo "Pre-release branches cleaned, dev reset from main" >> $GITHUB_STEP_SUMMARY + + - name: "Step 12: Create version branch from main" + if: steps.version.outputs.skip != 'true' + continue-on-error: true + run: | + API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" + TOKEN="${{ secrets.MOKOGITEA_TOKEN }}" + VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}" + BRANCH_NAME="version/${VERSION}" + MAIN_SHA=$(git rev-parse HEAD) + + # Delete old version branch if it exists (same version re-release) + curl -sf -X DELETE -H "Authorization: token ${TOKEN}" "${API_BASE}/branches/${BRANCH_NAME}" 2>/dev/null && echo "Deleted old ${BRANCH_NAME}" + + # Create version/XX.YY.ZZ from main + curl -sf -X POST -H "Authorization: token ${TOKEN}" -H "Content-Type: application/json" "${API_BASE}/branches" -d "{\"new_branch_name\":\"${BRANCH_NAME}\",\"old_branch_name\":\"main\"}" 2>/dev/null && echo "Created ${BRANCH_NAME} from main (${MAIN_SHA})" || echo "WARNING: ${BRANCH_NAME} creation failed" + + echo "Version branch created: ${BRANCH_NAME} (${MAIN_SHA})" >> $GITHUB_STEP_SUMMARY + + + + # -- Dolibarr post-release: Reset dev version ----------------------------- + - name: "Post-release: Reset dev version" + if: steps.version.outputs.skip != 'true' + continue-on-error: true + run: | + API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" + php /tmp/moko-platform-api/cli/version_reset_dev.php \ + --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \ + --branch dev --path . 2>&1 || true + + # -- Summary -------------------------------------------------------------- + - name: Pipeline Summary + if: always() + run: | + VERSION="${{ steps.bump.outputs.version || steps.version.outputs.version }}" + PLATFORM="${{ steps.platform.outputs.platform }}" + if [ "${{ steps.version.outputs.skip }}" = "true" ]; then + echo "## Release Skipped" >> $GITHUB_STEP_SUMMARY + echo "No VERSION in README.md" >> $GITHUB_STEP_SUMMARY + elif [ "${{ steps.check.outputs.already_released }}" = "true" ]; then + echo "## Already Released — ${VERSION}" >> $GITHUB_STEP_SUMMARY + else + echo "" >> $GITHUB_STEP_SUMMARY + echo "## Build & Release Complete (${PLATFORM})" >> $GITHUB_STEP_SUMMARY + echo "" >> $GITHUB_STEP_SUMMARY + echo "| Step | Result |" >> $GITHUB_STEP_SUMMARY + echo "|------|--------|" >> $GITHUB_STEP_SUMMARY + echo "| Platform | \`${PLATFORM}\` |" >> $GITHUB_STEP_SUMMARY + echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY + echo "| Branch | \`${{ steps.version.outputs.branch }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| Tag | \`${{ steps.version.outputs.tag }}\` |" >> $GITHUB_STEP_SUMMARY + echo "| Release | [View](${GITEA_URL}/${GITEA_ORG}/${GITEA_REPO}/releases/tag/${{ steps.version.outputs.tag }}) |" >> $GITHUB_STEP_SUMMARY + fi From f3a3bc90b3c9fd4edeba6f29cedfcc55ca205c87 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 18:48:13 -0500 Subject: [PATCH 057/220] feat: frontend ticket management with smart permissions Ticket List (view=tickets): - Staff see all tickets with Submitted By + Assigned To columns - Customers see only their own tickets - Status filter dropdown for staff - isStaff check: core.admin OR mokowaas.tickets ACL Ticket Detail (view=ticket): - Staff see all tickets + internal notes (yellow highlight) - Customers see only their own + no internal notes - Staff sidebar: ticket details, change status buttons, assign to me - Staff can post internal notes from frontend - Customers can reply (disabled for closed tickets) - Ownership enforced: customers can't view/reply to others' tickets Controller: - updateStatus: staff only - assignTicket: mokowaas.tickets.assign ACL - submitReply: verifies ownership OR staff Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../site/src/View/Ticket/HtmlView.php | 34 +- .../site/src/View/Tickets/HtmlView.php | 31 +- .../com_mokowaas/site/tmpl/ticket/default.php | 299 ++++++++++++------ .../site/tmpl/tickets/default.php | 148 +++------ 4 files changed, 308 insertions(+), 204 deletions(-) diff --git a/src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php b/src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php index c5a929f4..4a4289e6 100644 --- a/src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php +++ b/src/packages/com_mokowaas/site/src/View/Ticket/HtmlView.php @@ -17,6 +17,8 @@ use Joomla\CMS\Router\Route; class HtmlView extends BaseHtmlView { protected $ticket; + protected $isStaff = false; + protected $canAssign = false; public function display($tpl = null) { @@ -24,16 +26,29 @@ class HtmlView extends BaseHtmlView $user = Factory::getApplication()->getIdentity(); $id = Factory::getApplication()->getInput()->getInt('id', 0); - // Get ticket — only if owned by this user + $this->isStaff = $user->authorise('core.admin') || $user->authorise('mokowaas.tickets', 'com_mokowaas'); + $this->canAssign = $user->authorise('core.admin') || $user->authorise('mokowaas.tickets.assign', 'com_mokowaas'); + + // Get ticket — staff see any, customers see only their own $query = $db->getQuery(true) ->select([ $db->quoteName('t') . '.*', $db->quoteName('c.title', 'category_title'), + $db->quoteName('u.name', 'created_by_name'), + $db->quoteName('u.email', 'created_by_email'), + $db->quoteName('a.name', 'assigned_to_name'), ]) ->from($db->quoteName('#__mokowaas_tickets', 't')) ->leftJoin($db->quoteName('#__mokowaas_ticket_categories', 'c') . ' ON c.id = t.category_id') - ->where($db->quoteName('t.id') . ' = ' . $id) - ->where($db->quoteName('t.created_by') . ' = ' . (int) $user->id); + ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = t.created_by') + ->leftJoin($db->quoteName('#__users', 'a') . ' ON a.id = t.assigned_to') + ->where($db->quoteName('t.id') . ' = ' . $id); + + if (!$this->isStaff) + { + $query->where($db->quoteName('t.created_by') . ' = ' . (int) $user->id); + } + $db->setQuery($query); $this->ticket = $db->loadObject(); @@ -45,7 +60,7 @@ class HtmlView extends BaseHtmlView return; } - // Load replies (exclude internal notes) + // Load replies — staff see internal notes, customers don't $query = $db->getQuery(true) ->select([ $db->quoteName('r') . '.*', @@ -53,9 +68,14 @@ class HtmlView extends BaseHtmlView ]) ->from($db->quoteName('#__mokowaas_ticket_replies', 'r')) ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = r.user_id') - ->where($db->quoteName('r.ticket_id') . ' = ' . $id) - ->where($db->quoteName('r.is_internal') . ' = 0') - ->order($db->quoteName('r.created') . ' ASC'); + ->where($db->quoteName('r.ticket_id') . ' = ' . $id); + + if (!$this->isStaff) + { + $query->where($db->quoteName('r.is_internal') . ' = 0'); + } + + $query->order($db->quoteName('r.created') . ' ASC'); $db->setQuery($query); $this->ticket->replies = $db->loadObjectList() ?: []; diff --git a/src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php b/src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php index 933e5c55..5988fba9 100644 --- a/src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php +++ b/src/packages/com_mokowaas/site/src/View/Tickets/HtmlView.php @@ -17,13 +17,17 @@ class HtmlView extends BaseHtmlView { protected $tickets = []; protected $categories = []; + protected $isStaff = false; public function display($tpl = null) { $db = Factory::getContainer()->get('Joomla\Database\DatabaseInterface'); $user = Factory::getApplication()->getIdentity(); - // Get user's tickets + $this->isStaff = $user->authorise('core.admin') + || $user->authorise('mokowaas.tickets', 'com_mokowaas'); + + // Staff see all tickets, customers see their own $query = $db->getQuery(true) ->select([ $db->quoteName('t.id'), @@ -31,18 +35,33 @@ class HtmlView extends BaseHtmlView $db->quoteName('t.status'), $db->quoteName('t.priority'), $db->quoteName('t.created'), - $db->quoteName('t.modified'), + $db->quoteName('t.assigned_to'), $db->quoteName('c.title', 'category_title'), + $db->quoteName('u.name', 'created_by_name'), + $db->quoteName('a.name', 'assigned_to_name'), ]) ->from($db->quoteName('#__mokowaas_tickets', 't')) ->leftJoin($db->quoteName('#__mokowaas_ticket_categories', 'c') . ' ON c.id = t.category_id') - ->where($db->quoteName('t.created_by') . ' = ' . (int) $user->id) - ->order($db->quoteName('t.created') . ' DESC') - ->setLimit(50); + ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = t.created_by') + ->leftJoin($db->quoteName('#__users', 'a') . ' ON a.id = t.assigned_to'); + + if (!$this->isStaff) + { + $query->where($db->quoteName('t.created_by') . ' = ' . (int) $user->id); + } + + $filterStatus = Factory::getApplication()->getInput()->getString('filter_status', ''); + + if ($filterStatus) + { + $query->where($db->quoteName('t.status') . ' = ' . $db->quote($filterStatus)); + } + + $query->order($db->quoteName('t.created') . ' DESC')->setLimit(50); $db->setQuery($query); $this->tickets = $db->loadObjectList() ?: []; - // Get categories for new ticket form + // Categories for new ticket form $query = $db->getQuery(true) ->select([$db->quoteName('id'), $db->quoteName('title')]) ->from($db->quoteName('#__mokowaas_ticket_categories')) diff --git a/src/packages/com_mokowaas/site/tmpl/ticket/default.php b/src/packages/com_mokowaas/site/tmpl/ticket/default.php index 5c6d135d..7f84e579 100644 --- a/src/packages/com_mokowaas/site/tmpl/ticket/default.php +++ b/src/packages/com_mokowaas/site/tmpl/ticket/default.php @@ -1,22 +1,19 @@ ticket; -$token = Session::getFormToken(); +$t = $this->ticket; +$isStaff = $this->isStaff; +$canAssign = $this->canAssign; +$token = Session::getFormToken(); +$userId = Factory::getApplication()->getIdentity()->id; $statusLabel = [ - 'open' => 'Open', 'in_progress' => 'In Progress', 'waiting' => 'Awaiting Your Response', + 'open' => 'Open', 'in_progress' => 'In Progress', 'waiting' => 'Awaiting Response', 'resolved' => 'Resolved', 'closed' => 'Closed', ]; $statusClass = [ @@ -28,99 +25,217 @@ $statusClass = [
- Back to My Tickets + Back to Tickets
- -
-
-
-
-

#id; ?> — subject); ?>

- - category_title ?? 'General'); ?> - · Submitted created, 'M d, Y \a\t H:i'); ?> - · Priority: priority); ?> - +
+ +
+ + +
+
+
+
+

#id; ?> — subject); ?>

+ + category_title ?? 'General'); ?> + · created, 'M d, Y H:i'); ?> + · priority); ?> + + · By: created_by_name); ?> + + +
+ + status] ?? $t->status; ?> + +
- - status] ?? ucfirst($t->status); ?> -
-
-
- -
-
- You - created, 'M d, Y H:i'); ?> -
-
body)); ?>
-
- - - replies as $reply): ?> - user_id !== (int) $t->created_by); - ?> -
-
-
- user_name ?? 'Support'); ?> - - Staff - - created, 'M d, Y H:i'); ?> -
-
-
body)); ?>
-
- - - - status, ['closed', 'resolved'])): ?> -
-
-
Reply
-
-
- + +
+
+ created_by_name); ?> + created, 'M d, Y H:i'); ?>
- - - - +
body)); ?>
+
+ + + replies as $reply): ?> + user_id !== (int) $t->created_by); + $isInternal = (int) $reply->is_internal; + ?> +
+
+
+ user_name ?? 'Support'); ?> + Staff + Internal Note + created, 'M d, Y H:i'); ?> +
+
+
body)); ?>
+
+ + + + status, ['closed'])): ?> +
+
+
Reply
+
+ + + +
+ + + + +
+
+
+
+ status === 'closed'): ?> +
+ This ticket is closed. Open a new ticket if you need further help. +
+
+ + + +
+ +
+
Details
+
+
+
Status
+
status] ?? $t->status; ?>
+
Priority
+
priority); ?>
+
Category
+
category_title ?? '—'); ?>
+
Submitted By
+
created_by_name); ?>
created_by_email ?? ''); ?>
+
Assigned To
+
assigned_to_name ?? 'Unassigned'); ?>
+
Created
+
created, 'M d H:i'); ?>
+
Replies
+
replies); ?>
+
+
+
+ + +
+
Change Status
+
+ 'Reopen', 'in_progress' => 'In Progress', 'waiting' => 'Waiting on Customer', 'resolved' => 'Resolve', 'closed' => 'Close'] as $s => $label): ?> + status): ?> + + + +
+
+ + + +
+
Assign
+
+ +
+
+ +
+
- -
- This ticket is status] ?? $t->status); ?>. If you need further help, please open a new ticket. -
-
diff --git a/src/packages/com_mokowaas/site/tmpl/tickets/default.php b/src/packages/com_mokowaas/site/tmpl/tickets/default.php index f9face45..8ed9e1a3 100644 --- a/src/packages/com_mokowaas/site/tmpl/tickets/default.php +++ b/src/packages/com_mokowaas/site/tmpl/tickets/default.php @@ -1,11 +1,4 @@ tickets; $categories = $this->categories; +$isStaff = $this->isStaff; $token = Session::getFormToken(); $statusLabel = [ @@ -28,106 +22,62 @@ $statusClass = [
-

My Support Tickets

- -
- - -
-
-
-
Submit a Support Request
-
-
- - -
-
-
- - -
-
- - -
-
-
- - -
- - -
-
+

+
+ + New Ticket + + +
+ + + +
+
-
- You haven't submitted any support tickets yet. Click "New Ticket" above to get started. +
-
- - -
-
-
#id; ?> — subject); ?>
- - category_title ?? 'General'); ?> - · created, 'M d, Y'); ?> - -
-
- - status] ?? ucfirst($t->status); ?> - -
- priority); ?> -
-
- - +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
#SubjectStatusPriorityCategorySubmitted ByAssigned ToDate
id; ?>subject, 0, 60)); ?>status] ?? $t->status; ?>priority); ?>category_title ?? '—'); ?>created_by_name ?? ''); ?>assigned_to_name ?? 'Unassigned'); ?>created, 'M d, Y'); ?>
- - From 8168bfb2dc55cb379bea2b273ac0a1387950aade Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 23:48:57 +0000 Subject: [PATCH 058/220] chore(version): auto-bump 02.32.37 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 47 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 30095f8b..25f7022e 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.36 + 02.32.37 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index d689b2da..8c3f3b4f 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.36 +# VERSION: 02.32.37 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index edd9c8df..df38c821 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.36 + VERSION: 02.32.37 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index db283c68..02c7a29b 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 8acbd856..89475a83 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 23d7ef81..da63bb53 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.36 + VERSION: 02.32.37 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 1b864ced..d568be81 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index c7ffa0dd..4f2a2f84 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.36 +VERSION: 02.32.37 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 3d214476..52f7bcfc 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.36) +# MokoWaaS Build Guide (VERSION: 02.32.37) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 92eea908..9f0833db 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.36) +# MokoWaaS Configuration Guide (VERSION: 02.32.37) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 98021ddb..4b6652f7 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.36) +# MokoWaaS Installation Guide (VERSION: 02.32.37) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 0c0e0230..6aedd7a5 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.36) +# MokoWaaS Operations Guide (VERSION: 02.32.37) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index fea5af83..d1399242 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.36) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.37) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 0ea0eb3b..56c9858c 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.36) +# MokoWaaS Testing Guide (VERSION: 02.32.37) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 5b6a3892..e8a2948c 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.36) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.37) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index fb050844..d454014d 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.36) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.37) ## Introduction diff --git a/docs/index.md b/docs/index.md index fbfcdcf2..ba743aeb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.36 + VERSION: 02.32.37 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.36) +# MokoWaaS Documentation Index (VERSION: 02.32.37) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 7f08c682..403740bf 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.36 + VERSION: 02.32.37 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.36) +# MokoWaaS Plugin Overview (VERSION: 02.32.37) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 8efbe3b6..561fdba6 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.36 +VERSION: 02.32.37 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2f50b935..f0f2cfca 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index a7da2b4d..84408894 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 635d09e0..e9590d52 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 8a27cc8e..3ca1d92a 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index bff139e0..edad19d9 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 966c5b49..4a36ccfc 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 0ea18a7c..3ec57406 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index dcbb7f76..4bc582bc 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 0da36af4..d99dfc99 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index f0f65df6..73d22aff 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.36 + * VERSION: 02.32.37 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 66238506..3889d9b2 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.36 + * VERSION: 02.32.37 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 0145742a..c0813e2d 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.36 + * VERSION: 02.32.37 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index e80c9745..70ff560d 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index ed34f452..69fd80ec 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index a118ce5c..9a7d501b 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.36 + * VERSION: 02.32.37 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 2003509b..dfe15940 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 333fdb66..d52be750 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index f47078c2..1c3f44c6 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 41eac267..31a9b055 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index c3ab49c7..235b5d2c 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 6fe5a133..9219cbee 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 - 02.32.36 + 02.32.37 + 02.32.37 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index d64a96d6..a07c13de 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 + 02.32.37 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 94327d3d..93fdf7b1 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 - 02.32.36 + 02.32.37 + 02.32.37 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index c7ceee64..0c4ff608 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.36 - 02.32.36 + 02.32.37 + 02.32.37 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index eada063c..1d2a14fa 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.36 + * VERSION: 02.32.37 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 7ec9ac2f..ffcf65e2 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.36 + * VERSION: 02.32.37 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index a5eb97a8..e3ed626f 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.36 + 02.32.37 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 2a0773f6..32daffe9 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From c5552a94fb51722b7fda85e3cc45645ac263c888 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Tue, 2 Jun 2026 23:48:58 +0000 Subject: [PATCH 059/220] chore: update development channel 02.32.37 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 32daffe9..0d12cb41 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.36-dev + 02.32.37-dev 2026-06-02 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.36-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.37-dev.zip - d8c4739ac985757071eb0dd00d8ea3b64af7b53d9d18a4654fedcc83ffb24d1b + b4bea266f76b874759da7992ebce08a827def90eddf448291b6efce95959c6ba dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From ac920b997a23010fa9cc378f6134fbc9acb7a8fc Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 19:29:10 -0500 Subject: [PATCH 060/220] feat: helpdesk automation engine + scheduled task plugin Automation engine in TicketsModel: - Condition evaluator: field/op/value with eq, neq, gt, lt, in, not_in - Action executor: set_status, set_priority, assign, add_note - Trigger events: ticket_created, ticket_replied, status_changed, scheduled - Hooks wired into createTicket, addReply, updateStatus Scheduled task plugin (plg_task_mokowaas_tickets): - Runs all 'scheduled' automation rules against non-closed tickets - Evaluates age_hours, status, priority, sla_responded - Joomla Scheduler integration via TaskPluginTrait Default automation rules: 1. Auto-close resolved tickets after 7 days 2. Escalate urgent tickets with no response in 1 hour 3. Notify on high/urgent ticket creation Also: - Added #__mokowaas_ticket_automation table - Fixed dashboard ImportModel null error (direct instantiation) - Added task plugin to package manifest + script.php Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../com_mokowaas/admin/sql/install.mysql.sql | 17 ++ .../admin/src/Model/TicketsModel.php | 238 ++++++++++++++++++ .../admin/src/View/Dashboard/HtmlView.php | 14 +- .../en-GB/plg_task_mokowaas_tickets.ini | 4 + .../en-GB/plg_task_mokowaas_tickets.sys.ini | 2 + .../mokowaas_tickets.xml | 25 ++ .../services/provider.php | 27 ++ .../src/Extension/TicketAutomation.php | 65 +++++ src/pkg_mokowaas.xml | 1 + src/script.php | 2 + 10 files changed, 392 insertions(+), 3 deletions(-) create mode 100644 src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.ini create mode 100644 src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.sys.ini create mode 100644 src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml create mode 100644 src/packages/plg_task_mokowaas_tickets/services/provider.php create mode 100644 src/packages/plg_task_mokowaas_tickets/src/Extension/TicketAutomation.php diff --git a/src/packages/com_mokowaas/admin/sql/install.mysql.sql b/src/packages/com_mokowaas/admin/sql/install.mysql.sql index 12dbca53..208a25bd 100644 --- a/src/packages/com_mokowaas/admin/sql/install.mysql.sql +++ b/src/packages/com_mokowaas/admin/sql/install.mysql.sql @@ -61,6 +61,23 @@ CREATE TABLE IF NOT EXISTS `#__mokowaas_ticket_canned` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; +CREATE TABLE IF NOT EXISTS `#__mokowaas_ticket_automation` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `title` VARCHAR(255) NOT NULL, + `trigger_event` VARCHAR(50) NOT NULL DEFAULT 'ticket_created', + `conditions` TEXT NOT NULL DEFAULT '[]', + `actions` TEXT NOT NULL DEFAULT '[]', + `enabled` TINYINT NOT NULL DEFAULT 1, + `ordering` INT NOT NULL DEFAULT 0, + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- Default automation rules +INSERT IGNORE INTO `#__mokowaas_ticket_automation` (`id`, `title`, `trigger_event`, `conditions`, `actions`, `enabled`, `ordering`) VALUES +(1, 'Auto-close resolved tickets after 7 days', 'scheduled', '[{"field":"status","op":"eq","value":"resolved"},{"field":"age_hours","op":"gt","value":"168"}]', '[{"type":"set_status","value":"closed"},{"type":"add_note","value":"Auto-closed after 7 days with no response."}]', 1, 1), +(2, 'Escalate urgent tickets with no response in 1 hour', 'scheduled', '[{"field":"priority","op":"eq","value":"urgent"},{"field":"sla_responded","op":"eq","value":"0"},{"field":"age_hours","op":"gt","value":"1"}]', '[{"type":"add_note","value":"SLA BREACH: Urgent ticket has no staff response after 1 hour."}]', 1, 2), +(3, 'Notify on high priority ticket creation', 'ticket_created', '[{"field":"priority","op":"in","value":"high,urgent"}]', '[{"type":"add_note","value":"High/urgent ticket created — requires immediate attention."}]', 1, 3); + -- Default categories INSERT IGNORE INTO `#__mokowaas_ticket_categories` (`id`, `title`, `alias`, `description`, `sla_response_minutes`, `sla_resolution_minutes`, `ordering`) VALUES (1, 'General Support', 'general-support', 'General questions and assistance', 480, 2880, 1), diff --git a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php index 8bad035d..657b7d71 100644 --- a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php @@ -173,6 +173,9 @@ class TicketsModel extends BaseDatabaseModel $db->insertObject('#__mokowaas_tickets', $ticket, 'id'); + // Run automation + $this->runAutomation('ticket_created', (int) $ticket->id); + return ['success' => true, 'message' => 'Ticket #' . $ticket->id . ' created.', 'id' => (int) $ticket->id]; } catch (\Throwable $e) @@ -212,6 +215,9 @@ class TicketsModel extends BaseDatabaseModel ->where($db->quoteName('sla_responded') . ' = 0') )->execute(); + // Run automation + $this->runAutomation('ticket_replied', $ticketId); + return ['success' => true, 'message' => 'Reply added.']; } catch (\Throwable $e) @@ -259,6 +265,9 @@ class TicketsModel extends BaseDatabaseModel ->where($db->quoteName('id') . ' = ' . $ticketId) )->execute(); + // Run automation + $this->runAutomation('status_changed', $ticketId); + return ['success' => true, 'message' => 'Status updated to ' . $status . '.']; } catch (\Throwable $e) @@ -351,6 +360,235 @@ class TicketsModel extends BaseDatabaseModel return $db->loadObjectList() ?: []; } + // ================================================================== + // Automation Engine + // ================================================================== + + /** + * Run automation rules for a specific trigger event against a ticket. + * + * @param string $event trigger_event: ticket_created, ticket_replied, status_changed, scheduled + * @param int $ticketId The ticket to evaluate + */ + public function runAutomation(string $event, int $ticketId): void + { + try + { + $db = $this->getDatabase(); + + // Load enabled rules for this event + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_ticket_automation')) + ->where($db->quoteName('trigger_event') . ' = ' . $db->quote($event)) + ->where($db->quoteName('enabled') . ' = 1') + ->order($db->quoteName('ordering') . ' ASC'); + $db->setQuery($query); + $rules = $db->loadObjectList() ?: []; + + if (empty($rules)) + { + return; + } + + // Load the ticket + $ticket = $this->getTicket($ticketId); + + if (!$ticket) + { + return; + } + + // Calculate age in hours + $ticket->age_hours = (time() - strtotime($ticket->created)) / 3600; + + foreach ($rules as $rule) + { + $conditions = json_decode($rule->conditions, true) ?: []; + $actions = json_decode($rule->actions, true) ?: []; + + if ($this->evaluateConditions($conditions, $ticket)) + { + $this->executeActions($actions, $ticketId, $ticket); + } + } + } + catch (\Throwable $e) + { + \Joomla\CMS\Log\Log::add('Automation error: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokowaas'); + } + } + + /** + * Run all scheduled automation rules against all open tickets. + */ + public function runScheduledAutomation(): array + { + $db = $this->getDatabase(); + $results = ['evaluated' => 0, 'acted' => 0]; + + // Load scheduled rules + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_ticket_automation')) + ->where($db->quoteName('trigger_event') . ' = ' . $db->quote('scheduled')) + ->where($db->quoteName('enabled') . ' = 1') + ->order($db->quoteName('ordering') . ' ASC'); + $db->setQuery($query); + $rules = $db->loadObjectList() ?: []; + + if (empty($rules)) + { + return $results; + } + + // Load all non-closed tickets + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('status') . ' != ' . $db->quote('closed')); + $db->setQuery($query); + $tickets = $db->loadObjectList() ?: []; + + foreach ($tickets as $ticket) + { + $ticket->age_hours = (time() - strtotime($ticket->created)) / 3600; + $ticket->replies = []; + $results['evaluated']++; + + foreach ($rules as $rule) + { + $conditions = json_decode($rule->conditions, true) ?: []; + $actions = json_decode($rule->actions, true) ?: []; + + if ($this->evaluateConditions($conditions, $ticket)) + { + $this->executeActions($actions, (int) $ticket->id, $ticket); + $results['acted']++; + } + } + } + + return $results; + } + + /** + * Evaluate a set of conditions against a ticket (all must match). + */ + private function evaluateConditions(array $conditions, object $ticket): bool + { + foreach ($conditions as $cond) + { + $field = $cond['field'] ?? ''; + $op = $cond['op'] ?? 'eq'; + $value = $cond['value'] ?? ''; + + $ticketValue = $ticket->{$field} ?? null; + + if ($ticketValue === null) + { + return false; + } + + switch ($op) + { + case 'eq': + if ((string) $ticketValue !== (string) $value) return false; + break; + case 'neq': + if ((string) $ticketValue === (string) $value) return false; + break; + case 'gt': + if ((float) $ticketValue <= (float) $value) return false; + break; + case 'lt': + if ((float) $ticketValue >= (float) $value) return false; + break; + case 'in': + $list = array_map('trim', explode(',', $value)); + if (!\in_array((string) $ticketValue, $list, true)) return false; + break; + case 'not_in': + $list = array_map('trim', explode(',', $value)); + if (\in_array((string) $ticketValue, $list, true)) return false; + break; + default: + return false; + } + } + + return true; + } + + /** + * Execute a set of actions on a ticket. + */ + private function executeActions(array $actions, int $ticketId, object $ticket): void + { + $db = $this->getDatabase(); + $now = Factory::getDate()->toSql(); + + foreach ($actions as $action) + { + $type = $action['type'] ?? ''; + $value = $action['value'] ?? ''; + + switch ($type) + { + case 'set_status': + $this->updateStatus($ticketId, $value); + break; + + case 'set_priority': + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_tickets')) + ->set($db->quoteName('priority') . ' = ' . $db->quote($value)) + ->set($db->quoteName('modified') . ' = ' . $db->quote($now)) + ->where($db->quoteName('id') . ' = ' . $ticketId) + )->execute(); + break; + + case 'assign': + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_tickets')) + ->set($db->quoteName('assigned_to') . ' = ' . (int) $value) + ->set($db->quoteName('modified') . ' = ' . $db->quote($now)) + ->where($db->quoteName('id') . ' = ' . $ticketId) + )->execute(); + break; + + case 'add_note': + $reply = (object) [ + 'ticket_id' => $ticketId, + 'user_id' => 0, + 'body' => $value, + 'is_internal' => 1, + 'created' => $now, + ]; + $db->insertObject('#__mokowaas_ticket_replies', $reply, 'id'); + break; + } + } + } + + /** + * Get all automation rules. + */ + public function getAutomationRules(): array + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_ticket_automation')) + ->order($db->quoteName('ordering') . ' ASC') + ); + + return $db->loadObjectList() ?: []; + } + // ================================================================== // Akeeba Ticket System Importer // ================================================================== diff --git a/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php index 8638da95..b8b2f0db 100644 --- a/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php +++ b/src/packages/com_mokowaas/admin/src/View/Dashboard/HtmlView.php @@ -36,9 +36,17 @@ class HtmlView extends BaseHtmlView $this->wafBlocks = $model->getRecentWafBlocks(5); // Check for importable Akeeba data - $importModel = $this->getModel('Import'); - $this->adminToolsAvailable = $importModel->checkAdminToolsAvailable(); - $this->atsAvailable = $importModel->checkAtsAvailable(); + try + { + $importModel = new \Moko\Component\MokoWaaS\Administrator\Model\ImportModel(); + $this->adminToolsAvailable = $importModel->checkAdminToolsAvailable(); + $this->atsAvailable = $importModel->checkAtsAvailable(); + } + catch (\Throwable $e) + { + $this->adminToolsAvailable = null; + $this->atsAvailable = null; + } $this->addToolbar(); diff --git a/src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.ini b/src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.ini new file mode 100644 index 00000000..5b695de4 --- /dev/null +++ b/src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.ini @@ -0,0 +1,4 @@ +PLG_TASK_MOKOWAAS_TICKETS="Task - MokoWaaS Ticket Automation" +PLG_TASK_MOKOWAAS_TICKETS_DESC="Runs scheduled helpdesk automation rules." +PLG_TASK_MOKOWAAS_TICKETS_AUTOMATION_TITLE="MokoWaaS: Ticket Automation" +PLG_TASK_MOKOWAAS_TICKETS_AUTOMATION_DESC="Runs time-based automation rules against open tickets (auto-close, SLA escalation, etc.)." diff --git a/src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.sys.ini b/src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.sys.ini new file mode 100644 index 00000000..c0dc6562 --- /dev/null +++ b/src/packages/plg_task_mokowaas_tickets/language/en-GB/plg_task_mokowaas_tickets.sys.ini @@ -0,0 +1,2 @@ +PLG_TASK_MOKOWAAS_TICKETS="Task - MokoWaaS Ticket Automation" +PLG_TASK_MOKOWAAS_TICKETS_DESC="Runs scheduled helpdesk automation rules — auto-close, SLA escalation, and time-based actions." diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml new file mode 100644 index 00000000..c8e4801f --- /dev/null +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -0,0 +1,25 @@ + + + Task - MokoWaaS Ticket Automation + mokowaas_tickets + Moko Consulting + 2026-06-02 + Copyright (C) 2026 Moko Consulting. All rights reserved. + GPL-3.0-or-later + hello@mokoconsulting.tech + https://mokoconsulting.tech + 02.32.00 + Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. + Moko\Plugin\Task\MokoWaaSTickets + + + src + services + language + + + + en-GB/plg_task_mokowaas_tickets.ini + en-GB/plg_task_mokowaas_tickets.sys.ini + + diff --git a/src/packages/plg_task_mokowaas_tickets/services/provider.php b/src/packages/plg_task_mokowaas_tickets/services/provider.php new file mode 100644 index 00000000..e97c8c8e --- /dev/null +++ b/src/packages/plg_task_mokowaas_tickets/services/provider.php @@ -0,0 +1,27 @@ +set( + PluginInterface::class, + function (Container $container) { + $dispatcher = $container->get(DispatcherInterface::class); + $plugin = new TicketAutomation($dispatcher, (array) PluginHelper::getPlugin('task', 'mokowaas_tickets')); + $plugin->setApplication(Factory::getApplication()); + + return $plugin; + } + ); + } +}; diff --git a/src/packages/plg_task_mokowaas_tickets/src/Extension/TicketAutomation.php b/src/packages/plg_task_mokowaas_tickets/src/Extension/TicketAutomation.php new file mode 100644 index 00000000..3daa7aec --- /dev/null +++ b/src/packages/plg_task_mokowaas_tickets/src/Extension/TicketAutomation.php @@ -0,0 +1,65 @@ + [ + 'langConstPrefix' => 'PLG_TASK_MOKOWAAS_TICKETS_AUTOMATION', + 'method' => 'runAutomation', + ], + ]; + + protected $autoloadLanguage = true; + + public static function getSubscribedEvents(): array + { + return [ + 'onTaskOptionsList' => 'advertiseRoutines', + 'onExecuteTask' => 'standardRoutineHandler', + 'onContentPrepareForm' => 'enhanceTaskItemForm', + ]; + } + + /** + * Run all scheduled automation rules against open tickets. + */ + private function runAutomation(ExecuteTaskEvent $event): int + { + try + { + $model = new TicketsModel(); + $results = $model->runScheduledAutomation(); + + $this->logTask( + \sprintf('Ticket automation: evaluated %d tickets, acted on %d', $results['evaluated'], $results['acted']) + ); + + return Status::OK; + } + catch (\Throwable $e) + { + $this->logTask('Ticket automation failed: ' . $e->getMessage(), 'error'); + + return Status::KNOCKOUT; + } + } +} diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index a5eb97a8..67ea2c6f 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -24,6 +24,7 @@ plg_webservices_perfectpublisher.zip plg_task_mokowaasdemo.zip plg_task_mokowaassync.zip + plg_task_mokowaas_tickets.zip tpl_mokoonyx.zip diff --git a/src/script.php b/src/script.php index 7afd3b8c..882bcba5 100644 --- a/src/script.php +++ b/src/script.php @@ -47,6 +47,7 @@ class Pkg_MokowaasInstallerScript $this->enablePlugin('webservices', 'mokowaas'); $this->enablePlugin('task', 'mokowaasdemo'); $this->enablePlugin('task', 'mokowaassync'); + $this->enablePlugin('task', 'mokowaas_tickets'); // Migrate params from core plugin to feature plugins (one-time) $this->migrateFeatureParams(); @@ -411,6 +412,7 @@ class Pkg_MokowaasInstallerScript $db->quote('mod_mokowaas_cpanel'), $db->quote('mokowaasdemo'), $db->quote('mokowaassync'), + $db->quote('mokowaas_tickets'), $db->quote('perfectpublisher'), $db->quote('mokoonyx'), ]; From 6f762534feb1045a38ed8de57397f89615964e2f Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Wed, 3 Jun 2026 00:29:35 +0000 Subject: [PATCH 061/220] chore(version): auto-bump 02.32.38 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 25f7022e..41d3cc8e 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.37 + 02.32.38 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 8c3f3b4f..6ee01cc0 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.37 +# VERSION: 02.32.38 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index df38c821..d807934c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.37 + VERSION: 02.32.38 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 02c7a29b..c92e50a4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 89475a83..3aaac7b9 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index da63bb53..dfd2bca2 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.37 + VERSION: 02.32.38 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index d568be81..f62100a1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 4f2a2f84..9d3bd4cb 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.37 +VERSION: 02.32.38 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 52f7bcfc..b6e3729f 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.37) +# MokoWaaS Build Guide (VERSION: 02.32.38) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 9f0833db..6423146f 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.37) +# MokoWaaS Configuration Guide (VERSION: 02.32.38) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 4b6652f7..5ebdd419 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.37) +# MokoWaaS Installation Guide (VERSION: 02.32.38) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 6aedd7a5..51313d7b 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.37) +# MokoWaaS Operations Guide (VERSION: 02.32.38) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d1399242..8a641480 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.37) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.38) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 56c9858c..d63361bd 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.37) +# MokoWaaS Testing Guide (VERSION: 02.32.38) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index e8a2948c..8ba68bfe 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.37) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.38) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index d454014d..36dc88b5 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.37) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.38) ## Introduction diff --git a/docs/index.md b/docs/index.md index ba743aeb..ecd1c699 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.37 + VERSION: 02.32.38 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.37) +# MokoWaaS Documentation Index (VERSION: 02.32.38) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 403740bf..7f7b4ca0 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.37 + VERSION: 02.32.38 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.37) +# MokoWaaS Plugin Overview (VERSION: 02.32.38) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 561fdba6..f1e7e80b 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.37 +VERSION: 02.32.38 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index f0f2cfca..26b0a22f 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 84408894..5c812d75 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index e9590d52..2c11cd24 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 3ca1d92a..e47cb4de 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index edad19d9..0fc00fec 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 4a36ccfc..55434e9c 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 3ec57406..9bded352 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 4bc582bc..397ce8a5 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index d99dfc99..89b55bab 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 73d22aff..82b86917 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.37 + * VERSION: 02.32.38 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 3889d9b2..a406a08f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.37 + * VERSION: 02.32.38 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index c0813e2d..c6ec030e 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.37 + * VERSION: 02.32.38 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 70ff560d..167fef84 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 69fd80ec..54994381 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 9a7d501b..e8a0b43b 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.37 + * VERSION: 02.32.38 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index dfe15940..3352c44d 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index d52be750..b41eb570 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 1c3f44c6..9cf5b71b 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 31a9b055..12aeec39 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 235b5d2c..a3ecaa63 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index c8e4801f..28261dc2 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.00 + 02.32.38 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 9219cbee..9b51c115 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 - 02.32.37 + 02.32.38 + 02.32.38 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index a07c13de..4d7cc20c 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 + 02.32.38 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 93fdf7b1..acd22bee 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 - 02.32.37 + 02.32.38 + 02.32.38 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 0c4ff608..85db103f 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.37 - 02.32.37 + 02.32.38 + 02.32.38 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 1d2a14fa..c24ed438 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.37 + * VERSION: 02.32.38 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index ffcf65e2..c3cf50cc 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.37 + * VERSION: 02.32.38 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 2d73e2af..ddc9d815 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.37 + 02.32.38 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 0d12cb41..44c02f25 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 9cf3b510242dab9e77fbd1eef0492ca7c46f9e6e Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Wed, 3 Jun 2026 00:29:36 +0000 Subject: [PATCH 062/220] chore: update development channel 02.32.38 [skip ci] --- updates.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/updates.xml b/updates.xml index 44c02f25..601dd08a 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.37-dev - 2026-06-02 + 02.32.38-dev + 2026-06-03 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.37-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.38-dev.zip - b4bea266f76b874759da7992ebce08a827def90eddf448291b6efce95959c6ba + 86a9c67320ac162c60004706d3aef824cc91a5409ba4576a8a87e9fcddea86dd dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From aab196c26b5a6686201579374d6b480a7336dd79 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 22:03:54 -0500 Subject: [PATCH 063/220] fix: hide import buttons after successful import + fix Factory class error Import markers stored in com_mokowaas component params (imported_admintools, imported_ats). checkAdminToolsAvailable() and checkAtsAvailable() return null if already imported, hiding the dashboard banner and ticket list button. Also fixed missing 'use Joomla\CMS\Factory' in admin tickets template. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/src/Model/ImportModel.php | 71 +++++++++++++++++++ .../admin/tmpl/tickets/default.php | 1 + 2 files changed, 72 insertions(+) diff --git a/src/packages/com_mokowaas/admin/src/Model/ImportModel.php b/src/packages/com_mokowaas/admin/src/Model/ImportModel.php index 660351a2..352c6adf 100644 --- a/src/packages/com_mokowaas/admin/src/Model/ImportModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/ImportModel.php @@ -28,9 +28,15 @@ class ImportModel extends BaseDatabaseModel { /** * Check if Admin Tools data is available for import. + * Returns null if already imported or no data found. */ public function checkAdminToolsAvailable(): ?object { + if ($this->wasImported('admintools')) + { + return null; + } + $db = $this->getDatabase(); try @@ -138,6 +144,8 @@ class ImportModel extends BaseDatabaseModel $this->disableAdminTools($db); $results['disabled'] = true; + $this->markImported('admintools'); + return [ 'success' => true, 'message' => \sprintf( @@ -542,9 +550,15 @@ class ImportModel extends BaseDatabaseModel /** * Check if ATS tables exist. + * Returns null if already imported or no data found. */ public function checkAtsAvailable(): ?object { + if ($this->wasImported('ats')) + { + return null; + } + $db = $this->getDatabase(); try @@ -612,6 +626,63 @@ class ImportModel extends BaseDatabaseModel $result['message'] .= ' Warning: could not disable ATS: ' . $e->getMessage(); } + $this->markImported('ats'); + return $result; } + + // ================================================================== + // Import markers (stored in component params) + // ================================================================== + + private function wasImported(string $key): bool + { + try + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + ); + $params = new Registry($db->loadResult() ?? '{}'); + + return (bool) $params->get('imported_' . $key, false); + } + catch (\Throwable $e) + { + return false; + } + } + + private function markImported(string $key): void + { + try + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + ); + $params = new Registry($db->loadResult() ?? '{}'); + $params->set('imported_' . $key, 1); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($params->toString())) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + )->execute(); + } + catch (\Throwable $e) + { + Log::add('Import marker error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } } diff --git a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php index 5d40328b..e5a7814b 100644 --- a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php @@ -1,6 +1,7 @@ Date: Wed, 3 Jun 2026 03:09:32 +0000 Subject: [PATCH 064/220] chore(version): auto-bump 02.32.39 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 41d3cc8e..a528dd05 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.38 + 02.32.39 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 6ee01cc0..6603393b 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.38 +# VERSION: 02.32.39 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index d807934c..0de57daa 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.38 + VERSION: 02.32.39 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c92e50a4..824fb2ab 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 3aaac7b9..b86e2e5d 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index dfd2bca2..056408e3 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.38 + VERSION: 02.32.39 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index f62100a1..648dd3f1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 9d3bd4cb..41f10724 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.38 +VERSION: 02.32.39 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index b6e3729f..46132c64 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.38) +# MokoWaaS Build Guide (VERSION: 02.32.39) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 6423146f..0530dea4 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.38) +# MokoWaaS Configuration Guide (VERSION: 02.32.39) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 5ebdd419..801d18f8 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.38) +# MokoWaaS Installation Guide (VERSION: 02.32.39) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 51313d7b..c6a65acf 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.38) +# MokoWaaS Operations Guide (VERSION: 02.32.39) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 8a641480..ce1d499b 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.38) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.39) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index d63361bd..0fd7ae40 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.38) +# MokoWaaS Testing Guide (VERSION: 02.32.39) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 8ba68bfe..05f8df8b 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.38) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.39) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 36dc88b5..a7511714 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.38) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.39) ## Introduction diff --git a/docs/index.md b/docs/index.md index ecd1c699..f1072432 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.38 + VERSION: 02.32.39 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.38) +# MokoWaaS Documentation Index (VERSION: 02.32.39) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 7f7b4ca0..6dd2f5ec 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.38 + VERSION: 02.32.39 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.38) +# MokoWaaS Plugin Overview (VERSION: 02.32.39) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index f1e7e80b..6e42650b 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.38 +VERSION: 02.32.39 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 26b0a22f..2191ecff 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 5c812d75..c409ca33 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 2c11cd24..ad840aae 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index e47cb4de..eb730765 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 0fc00fec..4f259ea3 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 55434e9c..72e4c9ad 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 9bded352..7a18f20c 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 397ce8a5..a0696587 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 89b55bab..b43f2f36 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 82b86917..304fb4df 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.38 + * VERSION: 02.32.39 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index a406a08f..dc3ca72f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.38 + * VERSION: 02.32.39 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index c6ec030e..19d8d3bb 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.38 + * VERSION: 02.32.39 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 167fef84..e2993f00 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 54994381..a5eb2059 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index e8a0b43b..037f2c85 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.38 + * VERSION: 02.32.39 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 3352c44d..b9bf33eb 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index b41eb570..0b6f142b 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 9cf5b71b..f84c1d57 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 12aeec39..795448ea 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index a3ecaa63..96c65296 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 28261dc2..a6b5602a 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 9b51c115..ddd297f5 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 - 02.32.38 + 02.32.39 + 02.32.39 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 4d7cc20c..8d498ef0 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 + 02.32.39 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index acd22bee..b607bd7e 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 - 02.32.38 + 02.32.39 + 02.32.39 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 85db103f..3481da47 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.38 - 02.32.38 + 02.32.39 + 02.32.39 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index c24ed438..1caa10e7 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.38 + * VERSION: 02.32.39 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index c3cf50cc..00e0cc20 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.38 + * VERSION: 02.32.39 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index ddc9d815..6d13b456 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.38 + 02.32.39 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 601dd08a..7e759319 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From bc22f33a0c4873bb025693ebc911f42b4d29eea6 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Wed, 3 Jun 2026 03:09:34 +0000 Subject: [PATCH 065/220] chore: update development channel 02.32.39 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 7e759319..6e89d756 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.38-dev + 02.32.39-dev 2026-06-03 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.38-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.39-dev.zip - 86a9c67320ac162c60004706d3aef824cc91a5409ba4576a8a87e9fcddea86dd + 71788c251ca10df254171cd4fe7fbf2a953ee714a65c485f34c55c496bbe152e dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 236a148d42ee9d09411ab363d52d55926914aaf9 Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Wed, 3 Jun 2026 03:10:33 +0000 Subject: [PATCH 066/220] chore: sync .mokogitea/workflows/repo-health.yml from moko-platform [skip ci] --- .mokogitea/workflows/repo-health.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.mokogitea/workflows/repo-health.yml b/.mokogitea/workflows/repo-health.yml index b23d971e..d7743f0a 100644 --- a/.mokogitea/workflows/repo-health.yml +++ b/.mokogitea/workflows/repo-health.yml @@ -41,7 +41,8 @@ permissions: env: # Release policy - Repository Variables Only - RELEASE_REQUIRED_REPO_VARS: RS_FTP_PATH_SUFFIX + # RS_FTP_PATH_SUFFIX removed — MokoGitea handles all releases now + RELEASE_REQUIRED_REPO_VARS: RELEASE_OPTIONAL_REPO_VARS: DEV_FTP_SUFFIX # Scripts governance policy From 79bc17912ac97785f47bdc40de46a43348dd779c Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Tue, 2 Jun 2026 22:52:21 -0500 Subject: [PATCH 067/220] feat: helpdesk email notifications (#135) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit NotificationService with dual recipient support: - Joomla user IDs (looks up email from #__users) - Raw email addresses (comma-separated) - Admin emails + admin user IDs from component params - Per-event smart routing (creator, assignee, admins) Events: - ticket_created → admin emails + assigned user - ticket_replied → creator + assigned user (skip internal notes) - status_changed → creator (includes old/new status) - ticket_assigned → newly assigned user Email format: plain text with ticket details + view link Automation engine: added send_email action type for rules to send emails to specific addresses. Config stored in com_mokowaas params.notifications: admin_emails: comma-separated email addresses admin_user_ids: comma-separated Joomla user IDs Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/src/Model/TicketsModel.php | 45 ++- .../admin/src/Service/NotificationService.php | 334 ++++++++++++++++++ 2 files changed, 376 insertions(+), 3 deletions(-) create mode 100644 src/packages/com_mokowaas/admin/src/Service/NotificationService.php diff --git a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php index 657b7d71..9b7a8169 100644 --- a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php @@ -12,6 +12,7 @@ defined('_JEXEC') or die; use Joomla\CMS\Factory; use Joomla\CMS\MVC\Model\BaseDatabaseModel; +use Moko\Component\MokoWaaS\Administrator\Service\NotificationService; class TicketsModel extends BaseDatabaseModel { @@ -173,8 +174,9 @@ class TicketsModel extends BaseDatabaseModel $db->insertObject('#__mokowaas_tickets', $ticket, 'id'); - // Run automation + // Run automation + notifications $this->runAutomation('ticket_created', (int) $ticket->id); + NotificationService::notify('ticket_created', $this->getTicket((int) $ticket->id)); return ['success' => true, 'message' => 'Ticket #' . $ticket->id . ' created.', 'id' => (int) $ticket->id]; } @@ -215,9 +217,14 @@ class TicketsModel extends BaseDatabaseModel ->where($db->quoteName('sla_responded') . ' = 0') )->execute(); - // Run automation + // Run automation + notifications (skip internal notes) $this->runAutomation('ticket_replied', $ticketId); + if (!$isInternal) + { + NotificationService::notify('ticket_replied', $this->getTicket($ticketId), ['reply_body' => $body]); + } + return ['success' => true, 'message' => 'Reply added.']; } catch (\Throwable $e) @@ -243,6 +250,15 @@ class TicketsModel extends BaseDatabaseModel $db = $this->getDatabase(); $now = Factory::getDate()->toSql(); + // Capture old status for notification + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('status')) + ->from($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('id') . ' = ' . $ticketId) + ); + $oldStatus = $db->loadResult() ?? ''; + $sets = [ $db->quoteName('status') . ' = ' . $db->quote($status), $db->quoteName('modified') . ' = ' . $db->quote($now), @@ -265,8 +281,9 @@ class TicketsModel extends BaseDatabaseModel ->where($db->quoteName('id') . ' = ' . $ticketId) )->execute(); - // Run automation + // Run automation + notifications $this->runAutomation('status_changed', $ticketId); + NotificationService::notify('status_changed', $this->getTicket($ticketId), ['old_status' => $oldStatus]); return ['success' => true, 'message' => 'Status updated to ' . $status . '.']; } @@ -569,6 +586,28 @@ class TicketsModel extends BaseDatabaseModel ]; $db->insertObject('#__mokowaas_ticket_replies', $reply, 'id'); break; + + case 'send_email': + // value = email address or comma-separated list + $emails = array_filter(array_map('trim', explode(',', $value))); + + foreach ($emails as $email) + { + try + { + $mailer = Factory::getMailer(); + $mailer->addRecipient($email); + $mailer->setSubject('[Ticket #' . $ticketId . '] Automation Alert'); + $mailer->setBody('Automation rule triggered for ticket #' . $ticketId . ': ' . ($ticket->subject ?? '')); + $mailer->isHtml(false); + $mailer->Send(); + } + catch (\Throwable $e) + { + \Joomla\CMS\Log\Log::add('Automation email failed: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokowaas'); + } + } + break; } } } diff --git a/src/packages/com_mokowaas/admin/src/Service/NotificationService.php b/src/packages/com_mokowaas/admin/src/Service/NotificationService.php new file mode 100644 index 00000000..57e00105 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/Service/NotificationService.php @@ -0,0 +1,334 @@ +isHtml(false); + $mailer->setSubject($subject); + $mailer->setBody($body); + + foreach ($recipients as $email) + { + $email = trim($email); + + if (empty($email) || !filter_var($email, FILTER_VALIDATE_EMAIL)) + { + continue; + } + + try + { + $mailer->clearAddresses(); + $mailer->addRecipient($email); + $mailer->Send(); + } + catch (\Throwable $e) + { + Log::add('Notification send failed to ' . $email . ': ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + } + catch (\Throwable $e) + { + Log::add('Notification error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + + /** + * Determine recipients based on event type and ticket data. + */ + private static function getRecipients(string $event, object $ticket): array + { + $emails = []; + + // Get notification config from component params + $config = self::getNotificationConfig(); + + // Always notify configured admin emails + $adminEmails = array_filter(array_map('trim', explode(',', $config['admin_emails'] ?? ''))); + $emails = array_merge($emails, $adminEmails); + + // Always notify configured admin user IDs + $adminUserIds = array_filter(array_map('intval', explode(',', $config['admin_user_ids'] ?? ''))); + + foreach ($adminUserIds as $uid) + { + $email = self::getUserEmail($uid); + + if ($email) + { + $emails[] = $email; + } + } + + switch ($event) + { + case 'ticket_created': + // Notify assigned user if any + if (!empty($ticket->assigned_to)) + { + $email = self::getUserEmail((int) $ticket->assigned_to); + + if ($email) + { + $emails[] = $email; + } + } + break; + + case 'ticket_replied': + // Notify ticket creator (customer gets notified of staff reply) + if (!empty($ticket->created_by)) + { + $email = self::getUserEmail((int) $ticket->created_by); + + if ($email) + { + $emails[] = $email; + } + } + + // Notify assigned user + if (!empty($ticket->assigned_to)) + { + $email = self::getUserEmail((int) $ticket->assigned_to); + + if ($email) + { + $emails[] = $email; + } + } + break; + + case 'status_changed': + // Notify ticket creator + if (!empty($ticket->created_by)) + { + $email = self::getUserEmail((int) $ticket->created_by); + + if ($email) + { + $emails[] = $email; + } + } + break; + + case 'ticket_assigned': + // Notify newly assigned user + if (!empty($ticket->assigned_to)) + { + $email = self::getUserEmail((int) $ticket->assigned_to); + + if ($email) + { + $emails[] = $email; + } + } + break; + } + + return array_unique($emails); + } + + /** + * Build email subject line. + */ + private static function buildSubject(string $event, object $ticket): string + { + $siteName = Factory::getConfig()->get('sitename', 'Support'); + $prefix = '[' . $siteName . ' #' . $ticket->id . '] '; + + switch ($event) + { + case 'ticket_created': + return $prefix . 'New Ticket: ' . ($ticket->subject ?? ''); + + case 'ticket_replied': + return $prefix . 'Reply: ' . ($ticket->subject ?? ''); + + case 'status_changed': + return $prefix . 'Status Changed: ' . ($ticket->subject ?? ''); + + case 'ticket_assigned': + return $prefix . 'Assigned: ' . ($ticket->subject ?? ''); + + default: + return $prefix . ($ticket->subject ?? ''); + } + } + + /** + * Build email body. + */ + private static function buildBody(string $event, object $ticket, array $extra): string + { + $siteName = Factory::getConfig()->get('sitename', 'Support'); + $siteUrl = rtrim(Uri::root(), '/'); + $ticketUrl = $siteUrl . '/index.php?option=com_mokowaas&view=ticket&id=' . $ticket->id; + + $lines = []; + $lines[] = $siteName . ' Support'; + $lines[] = str_repeat('-', 40); + $lines[] = ''; + + switch ($event) + { + case 'ticket_created': + $lines[] = 'A new support ticket has been created.'; + $lines[] = ''; + $lines[] = 'Subject: ' . ($ticket->subject ?? ''); + $lines[] = 'Priority: ' . ucfirst($ticket->priority ?? 'normal'); + $lines[] = 'Category: ' . ($ticket->category_title ?? 'General'); + $lines[] = ''; + + if (!empty($ticket->body)) + { + $lines[] = 'Description:'; + $lines[] = strip_tags($ticket->body); + $lines[] = ''; + } + break; + + case 'ticket_replied': + $lines[] = 'A new reply has been added to your ticket.'; + $lines[] = ''; + $lines[] = 'Subject: ' . ($ticket->subject ?? ''); + $lines[] = 'Status: ' . ucwords(str_replace('_', ' ', $ticket->status ?? '')); + $lines[] = ''; + + if (!empty($extra['reply_body'])) + { + $lines[] = 'Reply:'; + $lines[] = strip_tags($extra['reply_body']); + $lines[] = ''; + } + break; + + case 'status_changed': + $lines[] = 'Your ticket status has been updated.'; + $lines[] = ''; + $lines[] = 'Subject: ' . ($ticket->subject ?? ''); + $lines[] = 'New Status: ' . ucwords(str_replace('_', ' ', $ticket->status ?? '')); + + if (!empty($extra['old_status'])) + { + $lines[] = 'Old Status: ' . ucwords(str_replace('_', ' ', $extra['old_status'])); + } + + $lines[] = ''; + break; + + case 'ticket_assigned': + $lines[] = 'A ticket has been assigned to you.'; + $lines[] = ''; + $lines[] = 'Subject: ' . ($ticket->subject ?? ''); + $lines[] = 'Priority: ' . ucfirst($ticket->priority ?? 'normal'); + $lines[] = ''; + break; + } + + $lines[] = 'View ticket: ' . $ticketUrl; + $lines[] = ''; + $lines[] = '-- '; + $lines[] = $siteName . ' | Powered by MokoWaaS'; + + return implode("\n", $lines); + } + + /** + * Get email address for a Joomla user ID. + */ + private static function getUserEmail(int $userId): ?string + { + if ($userId <= 0) + { + return null; + } + + try + { + $db = Factory::getDbo(); + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('email')) + ->from($db->quoteName('#__users')) + ->where($db->quoteName('id') . ' = ' . $userId) + ); + + return $db->loadResult() ?: null; + } + catch (\Throwable $e) + { + return null; + } + } + + /** + * Get notification configuration from component params. + */ + private static function getNotificationConfig(): array + { + try + { + $db = Factory::getDbo(); + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + ); + + $params = json_decode($db->loadResult() ?? '{}', true); + + return $params['notifications'] ?? []; + } + catch (\Throwable $e) + { + return []; + } + } +} From 5a274f844c626cd09857fb4a37f36f88be64ccec Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Wed, 3 Jun 2026 03:52:41 +0000 Subject: [PATCH 068/220] chore(version): auto-bump 02.32.40 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index a528dd05..00f2abbb 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.39 + 02.32.40 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 6603393b..558fbf41 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.39 +# VERSION: 02.32.40 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 0de57daa..7937ffe4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.39 + VERSION: 02.32.40 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 824fb2ab..fb1faa66 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index b86e2e5d..0c38895e 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 056408e3..5d5ee35b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.39 + VERSION: 02.32.40 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 648dd3f1..a5860c21 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 41f10724..54a53e4f 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.39 +VERSION: 02.32.40 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 46132c64..13081213 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.39) +# MokoWaaS Build Guide (VERSION: 02.32.40) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 0530dea4..33f7695e 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.39) +# MokoWaaS Configuration Guide (VERSION: 02.32.40) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 801d18f8..c44236ae 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.39) +# MokoWaaS Installation Guide (VERSION: 02.32.40) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index c6a65acf..9bf3772d 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.39) +# MokoWaaS Operations Guide (VERSION: 02.32.40) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index ce1d499b..a1ef835c 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.39) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.40) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 0fd7ae40..f7987e82 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.39) +# MokoWaaS Testing Guide (VERSION: 02.32.40) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 05f8df8b..e743fb09 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.39) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.40) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index a7511714..f19a06e9 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.39) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.40) ## Introduction diff --git a/docs/index.md b/docs/index.md index f1072432..bf1b4891 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.39 + VERSION: 02.32.40 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.39) +# MokoWaaS Documentation Index (VERSION: 02.32.40) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 6dd2f5ec..b7ec2ea5 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.39 + VERSION: 02.32.40 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.39) +# MokoWaaS Plugin Overview (VERSION: 02.32.40) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 6e42650b..5fe6d02a 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.39 +VERSION: 02.32.40 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2191ecff..b10e1438 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index c409ca33..b9446382 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index ad840aae..e25a820b 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index eb730765..e3844ca5 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 4f259ea3..fa01b100 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 72e4c9ad..0a98d67c 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 7a18f20c..9d1495e2 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index a0696587..cd6b0741 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index b43f2f36..f9c14fbc 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 304fb4df..4119cdaf 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.39 + * VERSION: 02.32.40 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index dc3ca72f..878062a9 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.39 + * VERSION: 02.32.40 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 19d8d3bb..cba69d60 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.39 + * VERSION: 02.32.40 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index e2993f00..5dbc5b5d 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index a5eb2059..4fa87e17 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 037f2c85..c1ba2fb8 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.39 + * VERSION: 02.32.40 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index b9bf33eb..c7196de9 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 0b6f142b..5f4725db 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index f84c1d57..4b6a111c 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 795448ea..3c21e91a 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 96c65296..1702ba1f 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index a6b5602a..7db32cb6 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index ddd297f5..368004e9 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 - 02.32.39 + 02.32.40 + 02.32.40 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 8d498ef0..5226893b 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 + 02.32.40 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index b607bd7e..2452bed9 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 - 02.32.39 + 02.32.40 + 02.32.40 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 3481da47..2d161e68 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.39 - 02.32.39 + 02.32.40 + 02.32.40 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 1caa10e7..918265e2 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.39 + * VERSION: 02.32.40 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 00e0cc20..cbeaec18 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.39 + * VERSION: 02.32.40 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 6d13b456..ee9c5074 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.39 + 02.32.40 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 6e89d756..9b2530e9 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 53fe8c08a9d2e7962fe69b94fa31cbddb4f0492f Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Wed, 3 Jun 2026 03:52:42 +0000 Subject: [PATCH 069/220] chore: update development channel 02.32.40 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 9b2530e9..579b5200 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.39-dev + 02.32.40-dev 2026-06-03 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.39-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.40-dev.zip - 71788c251ca10df254171cd4fe7fbf2a953ee714a65c485f34c55c496bbe152e + ca582f5e1b524414d896b5b749d0ad004cff8b83f1e9d5a85d85f447d8de78dd dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 63fb1339b83a7f38388d6bd56340dc12ac8374f1 Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Wed, 3 Jun 2026 09:36:51 +0000 Subject: [PATCH 070/220] chore: sync .mokogitea/workflows/repo-health.yml from moko-platform [skip ci] --- .mokogitea/workflows/repo-health.yml | 125 ++------------------------- 1 file changed, 9 insertions(+), 116 deletions(-) diff --git a/.mokogitea/workflows/repo-health.yml b/.mokogitea/workflows/repo-health.yml index d7743f0a..8d57aaf0 100644 --- a/.mokogitea/workflows/repo-health.yml +++ b/.mokogitea/workflows/repo-health.yml @@ -11,7 +11,7 @@ # REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform # PATH: /templates/workflows/joomla/repo_health.yml.template # VERSION: 09.23.00 -# BRIEF: Enforces repository guardrails by validating release configuration, scripts governance, tooling availability, and core repository health artifacts. +# BRIEF: Enforces repository guardrails by validating scripts governance, tooling availability, and core repository health artifacts. # ============================================================================ name: "Generic: Repo Health" @@ -24,13 +24,12 @@ on: workflow_dispatch: inputs: profile: - description: 'Validation profile: all, release, scripts, or repo' + description: 'Validation profile: all, scripts, or repo' required: true default: all type: choice options: - all - - release - scripts - repo pull_request: @@ -40,11 +39,6 @@ permissions: contents: read env: - # Release policy - Repository Variables Only - # RS_FTP_PATH_SUFFIX removed — MokoGitea handles all releases now - RELEASE_REQUIRED_REPO_VARS: - RELEASE_OPTIONAL_REPO_VARS: DEV_FTP_SUFFIX - # Scripts governance policy SCRIPTS_REQUIRED_DIRS: SCRIPTS_ALLOWED_DIRS: scripts,scripts/fix,scripts/lib,scripts/release,scripts/run,scripts/validate @@ -139,101 +133,6 @@ jobs: printf '%s\n' 'ERROR: Access denied. Admin permission required.' >> "${GITHUB_STEP_SUMMARY}" exit 1 - release_config: - name: Release configuration - needs: access_check - if: ${{ needs.access_check.outputs.allowed == 'true' }} - runs-on: ubuntu-latest - timeout-minutes: 20 - permissions: - contents: read - - steps: - - name: Checkout - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6 - with: - fetch-depth: 0 - - - name: Guardrails release vars - env: - PROFILE_RAW: ${{ github.event.inputs.profile }} - RS_FTP_PATH_SUFFIX: ${{ vars.RS_FTP_PATH_SUFFIX }} - DEV_FTP_SUFFIX: ${{ vars.DEV_FTP_SUFFIX }} - run: | - set -euo pipefail - - profile="${PROFILE_RAW:-all}" - case "${profile}" in - all|release|scripts|repo) ;; - *) - printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" - exit 1 - ;; - esac - - if [ "${profile}" = 'scripts' ] || [ "${profile}" = 'repo' ]; then - { - printf '%s\n' '### Release configuration (Repository Variables)' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' 'Status: SKIPPED' - printf '%s\n' 'Reason: profile excludes release validation' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - exit 0 - fi - - IFS=',' read -r -a required <<< "${RELEASE_REQUIRED_REPO_VARS}" - IFS=',' read -r -a optional <<< "${RELEASE_OPTIONAL_REPO_VARS}" - - missing=() - missing_optional=() - - for k in "${required[@]}"; do - v="${!k:-}" - [ -z "${v}" ] && missing+=("${k}") - done - - for k in "${optional[@]}"; do - v="${!k:-}" - [ -z "${v}" ] && missing_optional+=("${k}") - done - - { - printf '%s\n' '### Release configuration (Repository Variables)' - printf '%s\n' "Profile: ${profile}" - printf '%s\n' '| Variable | Status |' - printf '%s\n' '|---|---|' - printf '%s\n' "| RS_FTP_PATH_SUFFIX | ${RS_FTP_PATH_SUFFIX:-NOT SET} |" - printf '%s\n' "| DEV_FTP_SUFFIX | ${DEV_FTP_SUFFIX:-NOT SET} |" - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - - if [ "${#missing_optional[@]}" -gt 0 ]; then - { - printf '%s\n' '### Missing optional repository variables' - for m in "${missing_optional[@]}"; do printf '%s\n' "- ${m}"; done - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - fi - - if [ "${#missing[@]}" -gt 0 ]; then - { - printf '%s\n' '### Missing required repository variables' - for m in "${missing[@]}"; do printf '%s\n' "- ${m}"; done - printf '%s\n' 'ERROR: Guardrails failed. Missing required repository variables.' - } >> "${GITHUB_STEP_SUMMARY}" - exit 1 - fi - - { - printf '%s\n' '### Repository variables validation result' - printf '%s\n' 'Status: OK' - printf '%s\n' 'All required repository variables present.' - printf '%s\n' '' - printf '%s\n' '**Note**: Organization secrets (RS_FTP_HOST, RS_FTP_USER, etc.) are validated at deployment time, not in repository health checks.' - printf '\n' - } >> "${GITHUB_STEP_SUMMARY}" - scripts_governance: name: Scripts governance needs: access_check @@ -257,14 +156,14 @@ jobs: profile="${PROFILE_RAW:-all}" case "${profile}" in - all|release|scripts|repo) ;; + all|scripts|repo) ;; *) printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" exit 1 ;; esac - if [ "${profile}" = 'release' ] || [ "${profile}" = 'repo' ]; then + if [ "${profile}" = 'repo' ]; then { printf '%s\n' '### Scripts governance' printf '%s\n' "Profile: ${profile}" @@ -371,14 +270,14 @@ jobs: profile="${PROFILE_RAW:-all}" case "${profile}" in - all|release|scripts|repo) ;; + all|scripts|repo) ;; *) printf '%s\n' "ERROR: Unknown profile: ${profile}" >> "${GITHUB_STEP_SUMMARY}" exit 1 ;; esac - if [ "${profile}" = 'release' ] || [ "${profile}" = 'scripts' ]; then + if [ "${profile}" = 'scripts' ]; then { printf '%s\n' '### Repository health' printf '%s\n' "Profile: ${profile}" @@ -705,7 +604,7 @@ jobs: printf '%s\n' '| Domain | Status | Notes |' printf '%s\n' '|---|---|---|' printf '%s\n' '| Access control | OK | Admin-only execution gate |' - printf '%s\n' '| Release variables | OK | Repository variables validation |' + printf '%s\n' '| Release policy | N/A | Releases handled by MokoGitea |' printf '%s\n' '| Scripts governance | OK | Directory policy and advisory reporting |' printf '%s\n' '| Repo required artifacts | OK | Required, optional, disallowed enforcement |' printf '%s\n' '| Repo content heuristics | OK | Brand, license, changelog structure |' @@ -774,11 +673,10 @@ jobs: report-issues: name: "Report Issues" runs-on: ubuntu-latest - needs: [access_check, release_config, scripts_governance, repo_health] + needs: [access_check, scripts_governance, repo_health] if: >- always() && - (needs.release_config.result == 'failure' || - needs.scripts_governance.result == 'failure' || + (needs.scripts_governance.result == 'failure' || needs.repo_health.result == 'failure') steps: @@ -804,10 +702,6 @@ jobs: fi } - report_gate "Release Configuration" \ - "${{ needs.release_config.result }}" \ - "Required repository variables are missing (RS_FTP_PATH_SUFFIX). Check repository settings." - report_gate "Scripts Governance" \ "${{ needs.scripts_governance.result }}" \ "Scripts directory policy violations detected. Review required and allowed directories." @@ -815,4 +709,3 @@ jobs: report_gate "Repository Health" \ "${{ needs.repo_health.result }}" \ "Repository health checks failed — missing required artifacts, disallowed files, or content warnings. Check the CI run summary." - From dd20e42cb2d02683ba0d49337a53159defeb0321 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Wed, 3 Jun 2026 11:53:54 -0500 Subject: [PATCH 071/220] feat: Privacy Guard - data compliance, consent, retention (#150) Admin Privacy Dashboard (view=privacy): - Data subject requests list with approve/deny actions - Retention policies table with active status - Summary cards (pending, total, consent entries, policies) - Export user data as JSON download - ACL: core.admin only PrivacyModel: - createRequest/processRequest for export/delete/anonymize - exportUserData: profile, articles, action logs, tickets, replies, consent history, Community Builder profile - anonymizeUserData: replace PII, block account, clear logs - deleteUserData: full hard delete (anonymize first, then remove) - logConsent/getUserConsent: consent tracking - enforceRetentionPolicies: action_logs, waf_logs, sessions, inactive_users, closed_tickets (scheduled task ready) - getDashboardSummary Frontend Self-Service (/index.php?option=com_mokowaas&view=privacy): - Download My Data, Anonymize, Delete Account buttons - Request history table - Consent history table - Login required Database tables: - #__mokowaas_consent_log - #__mokowaas_data_requests - #__mokowaas_retention_policies (5 defaults) Submenu: MokoWaaS > Privacy Guard Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/language/en-GB/com_mokowaas.sys.ini | 1 + .../com_mokowaas/admin/sql/install.mysql.sql | 48 ++ .../src/Controller/DisplayController.php | 39 ++ .../admin/src/Model/PrivacyModel.php | 590 ++++++++++++++++++ .../admin/src/View/Privacy/HtmlView.php | 39 ++ .../admin/tmpl/privacy/default.php | 184 ++++++ src/packages/com_mokowaas/mokowaas.xml | 1 + .../site/src/Controller/DisplayController.php | 20 + .../site/src/View/Privacy/HtmlView.php | 68 ++ .../site/tmpl/privacy/default.php | 114 ++++ 10 files changed, 1104 insertions(+) create mode 100644 src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Privacy/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/privacy/default.php create mode 100644 src/packages/com_mokowaas/site/src/View/Privacy/HtmlView.php create mode 100644 src/packages/com_mokowaas/site/tmpl/privacy/default.php diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini index bd380654..e5da7db4 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini @@ -12,4 +12,5 @@ COM_MOKOWAAS_MENU_UPDATES="Joomla Updates" COM_MOKOWAAS_MENU_CHECKIN="Global Check-in" COM_MOKOWAAS_MENU_TICKETS="Helpdesk" COM_MOKOWAAS_MENU_HTACCESS=".htaccess Maker" +COM_MOKOWAAS_MENU_PRIVACY="Privacy Guard" COM_MOKOWAAS_MENU_CACHE="Cache Management" diff --git a/src/packages/com_mokowaas/admin/sql/install.mysql.sql b/src/packages/com_mokowaas/admin/sql/install.mysql.sql index 208a25bd..0bd447a0 100644 --- a/src/packages/com_mokowaas/admin/sql/install.mysql.sql +++ b/src/packages/com_mokowaas/admin/sql/install.mysql.sql @@ -85,3 +85,51 @@ INSERT IGNORE INTO `#__mokowaas_ticket_categories` (`id`, `title`, `alias`, `des (3, 'Feature Request', 'feature-request', 'Request a new feature or enhancement', 1440, 10080, 3), (4, 'Billing', 'billing', 'Billing, invoicing, and payment questions', 240, 1440, 4), (5, 'Urgent / Outage', 'urgent-outage', 'Site down or critical issue', 60, 240, 5); + +-- +-- Privacy Guard Tables +-- + +CREATE TABLE IF NOT EXISTS `#__mokowaas_consent_log` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `user_id` INT NOT NULL, + `category` VARCHAR(50) NOT NULL, + `action` ENUM('granted','revoked') NOT NULL, + `ip_address` VARCHAR(45) NOT NULL DEFAULT '', + `created` DATETIME NOT NULL, + PRIMARY KEY (`id`), + KEY `idx_user` (`user_id`), + KEY `idx_category` (`category`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE IF NOT EXISTS `#__mokowaas_data_requests` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `user_id` INT NOT NULL, + `type` ENUM('export','delete','anonymize') NOT NULL, + `status` ENUM('pending','processing','completed','denied') NOT NULL DEFAULT 'pending', + `notes` TEXT, + `processed_by` INT DEFAULT NULL, + `created` DATETIME NOT NULL, + `processed` DATETIME DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `idx_user` (`user_id`), + KEY `idx_status` (`status`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +CREATE TABLE IF NOT EXISTS `#__mokowaas_retention_policies` ( + `id` INT UNSIGNED NOT NULL AUTO_INCREMENT, + `content_type` VARCHAR(100) NOT NULL, + `retention_days` INT UNSIGNED NOT NULL DEFAULT 365, + `action` ENUM('anonymize','delete','archive') NOT NULL DEFAULT 'anonymize', + `enabled` TINYINT NOT NULL DEFAULT 1, + `description` VARCHAR(255) NOT NULL DEFAULT '', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; + +-- Default retention policies +INSERT IGNORE INTO `#__mokowaas_retention_policies` (`id`, `content_type`, `retention_days`, `action`, `enabled`, `description`) VALUES +(1, 'action_logs', 90, 'delete', 1, 'Delete action log entries older than 90 days'), +(2, 'waf_logs', 30, 'delete', 1, 'Delete WAF block logs older than 30 days'), +(3, 'sessions', 7, 'delete', 1, 'Purge expired sessions older than 7 days'), +(4, 'inactive_users', 730, 'anonymize', 0, 'Anonymize users inactive for 2 years (disabled by default)'), +(5, 'closed_tickets', 365, 'anonymize', 0, 'Anonymize closed tickets older than 1 year (disabled by default)'); diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index 01ca5a98..648340a8 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -29,6 +29,7 @@ class DisplayController extends BaseController 'htaccess' => 'mokowaas.htaccess', 'tickets' => 'mokowaas.tickets', 'ticket' => 'mokowaas.tickets', + 'privacy' => 'core.admin', ]; public function display($cachable = false, $urlparams = []) @@ -268,6 +269,44 @@ class DisplayController extends BaseController } } + // ================================================================== + // Privacy Guard + // ================================================================== + + public function processDataRequest() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + if (!$this->checkAcl('core.admin')) + { + $this->jsonForbidden(); + } + + $input = Factory::getApplication()->getInput(); + $model = new \Moko\Component\MokoWaaS\Administrator\Model\PrivacyModel(); + + $this->jsonResponse($model->processRequest( + $input->getInt('request_id', 0), + $input->getString('action', 'deny') + )); + } + + public function exportUserData() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + if (!$this->checkAcl('core.admin')) + { + $this->jsonForbidden(); + } + + $model = new \Moko\Component\MokoWaaS\Administrator\Model\PrivacyModel(); + + $this->jsonResponse($model->exportUserData( + Factory::getApplication()->getInput()->getInt('user_id', 0) + )); + } + // ================================================================== // Importers // ================================================================== diff --git a/src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php b/src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php new file mode 100644 index 00000000..9bb53564 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php @@ -0,0 +1,590 @@ +getDatabase(); + $query = $db->getQuery(true) + ->select([ + $db->quoteName('r') . '.*', + $db->quoteName('u.name', 'user_name'), + $db->quoteName('u.email', 'user_email'), + $db->quoteName('u.username'), + $db->quoteName('p.name', 'processed_by_name'), + ]) + ->from($db->quoteName('#__mokowaas_data_requests', 'r')) + ->leftJoin($db->quoteName('#__users', 'u') . ' ON u.id = r.user_id') + ->leftJoin($db->quoteName('#__users', 'p') . ' ON p.id = r.processed_by'); + + if ($filterStatus) + { + $query->where($db->quoteName('r.status') . ' = ' . $db->quote($filterStatus)); + } + + $query->order($db->quoteName('r.created') . ' DESC')->setLimit(50); + $db->setQuery($query); + + return $db->loadObjectList() ?: []; + } + + /** + * Create a data request (from admin or user self-service). + */ + public function createRequest(int $userId, string $type, string $notes = ''): array + { + $validTypes = ['export', 'delete', 'anonymize']; + + if (!\in_array($type, $validTypes, true)) + { + return ['success' => false, 'message' => 'Invalid request type.']; + } + + try + { + $db = $this->getDatabase(); + $row = (object) [ + 'user_id' => $userId, + 'type' => $type, + 'status' => 'pending', + 'notes' => $notes, + 'created' => Factory::getDate()->toSql(), + ]; + + $db->insertObject('#__mokowaas_data_requests', $row, 'id'); + + return ['success' => true, 'message' => ucfirst($type) . ' request #' . $row->id . ' created.', 'id' => (int) $row->id]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Failed: ' . $e->getMessage()]; + } + } + + /** + * Process a data request (approve and execute). + */ + public function processRequest(int $requestId, string $action): array + { + $db = $this->getDatabase(); + + try + { + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_data_requests')) + ->where($db->quoteName('id') . ' = ' . $requestId) + ); + $request = $db->loadObject(); + + if (!$request) + { + return ['success' => false, 'message' => 'Request not found.']; + } + + if ($action === 'deny') + { + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_data_requests')) + ->set($db->quoteName('status') . ' = ' . $db->quote('denied')) + ->set($db->quoteName('processed_by') . ' = ' . (int) Factory::getApplication()->getIdentity()->id) + ->set($db->quoteName('processed') . ' = ' . $db->quote(Factory::getDate()->toSql())) + ->where($db->quoteName('id') . ' = ' . $requestId) + )->execute(); + + return ['success' => true, 'message' => 'Request denied.']; + } + + // Mark as processing + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_data_requests')) + ->set($db->quoteName('status') . ' = ' . $db->quote('processing')) + ->where($db->quoteName('id') . ' = ' . $requestId) + )->execute(); + + // Execute the request + $result = null; + + switch ($request->type) + { + case 'export': + $result = $this->exportUserData((int) $request->user_id); + break; + + case 'delete': + $result = $this->deleteUserData((int) $request->user_id); + break; + + case 'anonymize': + $result = $this->anonymizeUserData((int) $request->user_id); + break; + } + + // Mark completed + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_data_requests')) + ->set($db->quoteName('status') . ' = ' . $db->quote('completed')) + ->set($db->quoteName('processed_by') . ' = ' . (int) Factory::getApplication()->getIdentity()->id) + ->set($db->quoteName('processed') . ' = ' . $db->quote(Factory::getDate()->toSql())) + ->where($db->quoteName('id') . ' = ' . $requestId) + )->execute(); + + return $result ?? ['success' => true, 'message' => 'Request processed.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Processing failed: ' . $e->getMessage()]; + } + } + + /** + * Export all data for a user as a structured array. + */ + public function exportUserData(int $userId): array + { + $db = $this->getDatabase(); + $data = ['user_id' => $userId, 'exported' => gmdate('Y-m-d\TH:i:s\Z')]; + + try + { + // User profile + $db->setQuery( + $db->getQuery(true) + ->select(['id', 'name', 'username', 'email', 'registerDate', 'lastvisitDate', 'params']) + ->from($db->quoteName('#__users')) + ->where($db->quoteName('id') . ' = ' . $userId) + ); + $data['profile'] = $db->loadObject(); + + // Content (articles) + $db->setQuery( + $db->getQuery(true) + ->select(['id', 'title', 'alias', 'created', 'modified', 'hits']) + ->from($db->quoteName('#__content')) + ->where($db->quoteName('created_by') . ' = ' . $userId) + ); + $data['articles'] = $db->loadObjectList() ?: []; + + // Action logs + $db->setQuery( + $db->getQuery(true) + ->select(['message', 'log_date', 'ip_address']) + ->from($db->quoteName('#__action_logs')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + ->order('log_date DESC') + ->setLimit(100) + ); + $data['action_logs'] = $db->loadObjectList() ?: []; + + // Support tickets + $db->setQuery( + $db->getQuery(true) + ->select(['id', 'subject', 'body', 'status', 'priority', 'created']) + ->from($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('created_by') . ' = ' . $userId) + ); + $data['tickets'] = $db->loadObjectList() ?: []; + + // Ticket replies + $db->setQuery( + $db->getQuery(true) + ->select(['r.id', 'r.ticket_id', 'r.body', 'r.created']) + ->from($db->quoteName('#__mokowaas_ticket_replies', 'r')) + ->where($db->quoteName('r.user_id') . ' = ' . $userId) + ); + $data['ticket_replies'] = $db->loadObjectList() ?: []; + + // Consent log + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_consent_log')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + ->order('created ASC') + ); + $data['consent_history'] = $db->loadObjectList() ?: []; + + // Community Builder profile (if table exists) + try + { + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%comprofiler%')); + + if ($db->loadResult()) + { + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__comprofiler')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + ); + $data['community_builder'] = $db->loadObject(); + } + } + catch (\Throwable $e) {} + + return ['success' => true, 'message' => 'Data exported.', 'data' => $data]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Export failed: ' . $e->getMessage()]; + } + } + + /** + * Anonymize a user's data (GDPR right to be forgotten — soft). + */ + public function anonymizeUserData(int $userId): array + { + $db = $this->getDatabase(); + $now = Factory::getDate()->toSql(); + $anon = 'Anonymous User #' . $userId; + + try + { + // Anonymize user record + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__users')) + ->set([ + $db->quoteName('name') . ' = ' . $db->quote($anon), + $db->quoteName('username') . ' = ' . $db->quote('anon_' . $userId), + $db->quoteName('email') . ' = ' . $db->quote('anon_' . $userId . '@deleted.local'), + $db->quoteName('password') . ' = ' . $db->quote(''), + $db->quoteName('block') . ' = 1', + $db->quoteName('params') . ' = ' . $db->quote('{}'), + ]) + ->where($db->quoteName('id') . ' = ' . $userId) + )->execute(); + + // Anonymize article authorship + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__content')) + ->set($db->quoteName('created_by_alias') . ' = ' . $db->quote($anon)) + ->where($db->quoteName('created_by') . ' = ' . $userId) + )->execute(); + + // Delete action logs + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__action_logs')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + )->execute(); + + // Anonymize ticket replies + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_ticket_replies')) + ->set($db->quoteName('body') . ' = ' . $db->quote('[Content removed per data request]')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + )->execute(); + + // Community Builder + try + { + $db->setQuery('SHOW TABLES LIKE ' . $db->quote('%comprofiler%')); + + if ($db->loadResult()) + { + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__comprofiler')) + ->set([ + $db->quoteName('firstname') . ' = ' . $db->quote('Anonymous'), + $db->quoteName('lastname') . ' = ' . $db->quote('User'), + $db->quoteName('middlename') . ' = ' . $db->quote(''), + ]) + ->where($db->quoteName('user_id') . ' = ' . $userId) + )->execute(); + } + } + catch (\Throwable $e) {} + + // Log the anonymization + $this->logConsent($userId, 'account_anonymized', 'granted'); + + return ['success' => true, 'message' => 'User #' . $userId . ' data anonymized.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Anonymization failed: ' . $e->getMessage()]; + } + } + + /** + * Delete a user's data completely (hard delete). + */ + public function deleteUserData(int $userId): array + { + $result = $this->anonymizeUserData($userId); + + if (!$result['success']) + { + return $result; + } + + $db = $this->getDatabase(); + + try + { + // Delete tickets and replies + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('id')) + ->from($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('created_by') . ' = ' . $userId) + ); + $ticketIds = $db->loadColumn() ?: []; + + if (!empty($ticketIds)) + { + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__mokowaas_ticket_replies')) + ->where($db->quoteName('ticket_id') . ' IN (' . implode(',', $ticketIds) . ')') + )->execute(); + + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('created_by') . ' = ' . $userId) + )->execute(); + } + + // Delete consent log + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__mokowaas_consent_log')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + )->execute(); + + // Delete user record + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__users')) + ->where($db->quoteName('id') . ' = ' . $userId) + )->execute(); + + return ['success' => true, 'message' => 'User #' . $userId . ' data permanently deleted.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Deletion failed: ' . $e->getMessage()]; + } + } + + // ================================================================== + // Consent Management + // ================================================================== + + /** + * Get consent status for a user. + */ + public function getUserConsent(int $userId): array + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_consent_log')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + ->order($db->quoteName('created') . ' DESC') + ); + + return $db->loadObjectList() ?: []; + } + + /** + * Record a consent action. + */ + public function logConsent(int $userId, string $category, string $action): void + { + $db = $this->getDatabase(); + $row = (object) [ + 'user_id' => $userId, + 'category' => $category, + 'action' => $action === 'revoked' ? 'revoked' : 'granted', + 'ip_address' => $_SERVER['REMOTE_ADDR'] ?? '', + 'created' => Factory::getDate()->toSql(), + ]; + $db->insertObject('#__mokowaas_consent_log', $row, 'id'); + } + + // ================================================================== + // Retention Policy Enforcement + // ================================================================== + + /** + * Get all retention policies. + */ + public function getRetentionPolicies(): array + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_retention_policies')) + ->order($db->quoteName('id') . ' ASC') + ); + + return $db->loadObjectList() ?: []; + } + + /** + * Run retention policy enforcement (called by scheduled task). + */ + public function enforceRetentionPolicies(): array + { + $db = $this->getDatabase(); + $results = ['policies_run' => 0, 'items_affected' => 0]; + $policies = $this->getRetentionPolicies(); + + foreach ($policies as $policy) + { + if (!(int) $policy->enabled) + { + continue; + } + + $cutoff = Factory::getDate('-' . (int) $policy->retention_days . ' days')->toSql(); + $count = 0; + + try + { + switch ($policy->content_type) + { + case 'action_logs': + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__action_logs')) + ->where($db->quoteName('log_date') . ' < ' . $db->quote($cutoff)) + )->execute(); + $count = $db->getAffectedRows(); + break; + + case 'waf_logs': + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__mokowaas_waf_log')) + ->where($db->quoteName('created') . ' < ' . $db->quote($cutoff)) + )->execute(); + $count = $db->getAffectedRows(); + break; + + case 'sessions': + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__session')) + ->where($db->quoteName('time') . ' < ' . (int) strtotime($cutoff)) + )->execute(); + $count = $db->getAffectedRows(); + break; + + case 'closed_tickets': + if ($policy->action === 'anonymize') + { + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_tickets')) + ->set($db->quoteName('body') . ' = ' . $db->quote('[Removed per retention policy]')) + ->where($db->quoteName('status') . ' = ' . $db->quote('closed')) + ->where($db->quoteName('closed') . ' < ' . $db->quote($cutoff)) + ->where($db->quoteName('body') . ' != ' . $db->quote('[Removed per retention policy]')) + )->execute(); + $count = $db->getAffectedRows(); + } + break; + + case 'inactive_users': + if ($policy->action === 'anonymize') + { + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('id')) + ->from($db->quoteName('#__users')) + ->where($db->quoteName('lastvisitDate') . ' < ' . $db->quote($cutoff)) + ->where($db->quoteName('lastvisitDate') . ' != ' . $db->quote('0000-00-00 00:00:00')) + ->where($db->quoteName('block') . ' = 0') + ->where($db->quoteName('username') . ' NOT LIKE ' . $db->quote('anon_%')) + ); + $userIds = $db->loadColumn() ?: []; + + foreach ($userIds as $uid) + { + $this->anonymizeUserData((int) $uid); + $count++; + } + } + break; + } + + if ($count > 0) + { + $results['policies_run']++; + $results['items_affected'] += $count; + Log::add(\sprintf('Retention: %s — %d items affected', $policy->content_type, $count), Log::INFO, 'mokowaas'); + } + } + catch (\Throwable $e) + { + Log::add('Retention policy error (' . $policy->content_type . '): ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + + return $results; + } + + /** + * Get privacy dashboard summary counts. + */ + public function getDashboardSummary(): object + { + $db = $this->getDatabase(); + + $summary = (object) [ + 'pending_requests' => 0, + 'total_requests' => 0, + 'consent_entries' => 0, + 'policies_active' => 0, + ]; + + try + { + $db->setQuery('SELECT COUNT(*) FROM #__mokowaas_data_requests WHERE status = ' . $db->quote('pending')); + $summary->pending_requests = (int) $db->loadResult(); + + $db->setQuery('SELECT COUNT(*) FROM #__mokowaas_data_requests'); + $summary->total_requests = (int) $db->loadResult(); + + $db->setQuery('SELECT COUNT(*) FROM #__mokowaas_consent_log'); + $summary->consent_entries = (int) $db->loadResult(); + + $db->setQuery('SELECT COUNT(*) FROM #__mokowaas_retention_policies WHERE enabled = 1'); + $summary->policies_active = (int) $db->loadResult(); + } + catch (\Throwable $e) {} + + return $summary; + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Privacy/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Privacy/HtmlView.php new file mode 100644 index 00000000..b4d7e52d --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Privacy/HtmlView.php @@ -0,0 +1,39 @@ +getInput()->getString('filter_status', ''); + $this->requests = $model->getDataRequests($filterStatus); + $this->policies = $model->getRetentionPolicies(); + $this->summary = $model->getDashboardSummary(); + + $this->addToolbar(); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } + + protected function addToolbar(): void + { + ToolbarHelper::title('Privacy Guard', 'lock'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas'); + } +} diff --git a/src/packages/com_mokowaas/admin/tmpl/privacy/default.php b/src/packages/com_mokowaas/admin/tmpl/privacy/default.php new file mode 100644 index 00000000..0b6f6f72 --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/privacy/default.php @@ -0,0 +1,184 @@ +requests; +$policies = $this->policies; +$summary = $this->summary; +$token = Session::getFormToken(); + +$statusBadge = [ + 'pending' => 'bg-warning text-dark', + 'processing' => 'bg-info', + 'completed' => 'bg-success', + 'denied' => 'bg-secondary', +]; +$typeBadge = [ + 'export' => 'bg-primary', + 'delete' => 'bg-danger', + 'anonymize' => 'bg-warning text-dark', +]; +?> + +
+ +
+
+
+ pending_requests; ?> + Pending Requests +
+
+
+
+ total_requests; ?> + Total Requests +
+
+
+
+ consent_entries; ?> + Consent Entries +
+
+
+
+ policies_active; ?> + Active Policies +
+
+
+ +
+ +
+
+
+ Data Subject Requests +
+ + + +
+
+ +
No data requests found.
+ +
+ + + + + + + + + + + + + + + +
#UserTypeStatusCreatedProcessedActions
id; ?>escape($r->user_name ?? ''); ?>
escape($r->user_email ?? ''); ?>		type); ?>status); ?>created, 'M d, Y H:i'); ?>processed ? HTMLHelper::_('date', $r->processed, 'M d, Y H:i') : '—'; ?> + status === 'pending'): ?> +
+ + +
+ status === 'completed' && $r->type === 'export'): ?> + + +
+
+ +
+
+ + +
+
+
Retention Policies
+
+ + + + + + + + + + + + +
TypeDaysActionActive
escape($p->content_type); ?>retention_days; ?>action; ?>enabled ? 'Yes' : 'No'; ?>
+
+
+
+
+
+ + diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2191ecff..dea03743 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -32,6 +32,7 @@ COM_MOKOWAAS_MENU_EXTENSIONS COM_MOKOWAAS_MENU_TICKETS COM_MOKOWAAS_MENU_HTACCESS + COM_MOKOWAAS_MENU_PRIVACY COM_MOKOWAAS_MENU_PLUGINS COM_MOKOWAAS_MENU_UPDATES COM_MOKOWAAS_MENU_CHECKIN diff --git a/src/packages/com_mokowaas/site/src/Controller/DisplayController.php b/src/packages/com_mokowaas/site/src/Controller/DisplayController.php index 7d820b9f..4cecaf97 100644 --- a/src/packages/com_mokowaas/site/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/site/src/Controller/DisplayController.php @@ -163,6 +163,26 @@ class DisplayController extends BaseController } } + /** + * Submit a data privacy request from frontend. + */ + public function submitDataRequest() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + $user = Factory::getApplication()->getIdentity(); + + if ($user->guest) + { + $this->jsonResponse(['success' => false, 'message' => 'Please log in.']); + } + + $type = Factory::getApplication()->getInput()->getString('type', ''); + $model = new \Moko\Component\MokoWaaS\Administrator\Model\PrivacyModel(); + + $this->jsonResponse($model->createRequest($user->id, $type, 'Submitted via self-service portal')); + } + /** * Check if user is support staff (can manage tickets beyond their own). */ diff --git a/src/packages/com_mokowaas/site/src/View/Privacy/HtmlView.php b/src/packages/com_mokowaas/site/src/View/Privacy/HtmlView.php new file mode 100644 index 00000000..a6b70082 --- /dev/null +++ b/src/packages/com_mokowaas/site/src/View/Privacy/HtmlView.php @@ -0,0 +1,68 @@ +getIdentity(); + + if ($user->guest) + { + Factory::getApplication()->redirect(Route::_( + 'index.php?option=com_users&view=login&return=' . base64_encode('index.php?option=com_mokowaas&view=privacy'), + false + )); + + return; + } + + $db = Factory::getContainer()->get('Joomla\Database\DatabaseInterface'); + + // Get user's data requests + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_data_requests')) + ->where($db->quoteName('user_id') . ' = ' . (int) $user->id) + ->order($db->quoteName('created') . ' DESC'); + + try + { + $db->setQuery($query); + $this->requests = $db->loadObjectList() ?: []; + } + catch (\Throwable $e) + { + $this->requests = []; + } + + // Get consent history + try + { + $db->setQuery( + $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_consent_log')) + ->where($db->quoteName('user_id') . ' = ' . (int) $user->id) + ->order($db->quoteName('created') . ' DESC') + ->setLimit(20) + ); + $this->consent = $db->loadObjectList() ?: []; + } + catch (\Throwable $e) + { + $this->consent = []; + } + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/site/tmpl/privacy/default.php b/src/packages/com_mokowaas/site/tmpl/privacy/default.php new file mode 100644 index 00000000..f26b4e6a --- /dev/null +++ b/src/packages/com_mokowaas/site/tmpl/privacy/default.php @@ -0,0 +1,114 @@ +getIdentity(); +$requests = $this->requests; +$consent = $this->consent; +$token = Session::getFormToken(); + +$statusLabel = ['pending' => 'Pending', 'processing' => 'Processing', 'completed' => 'Completed', 'denied' => 'Denied']; +$statusClass = ['pending' => 'warning', 'processing' => 'info', 'completed' => 'success', 'denied' => 'secondary']; +?> + +
+

My Privacy & Data

+

Manage your personal data, download your information, or request account deletion.

+ + +
+
+ +
+
+ +
+
+ +
+
+ + + +
+
My Data Requests
+
+ + + + + + + + + + + + +
TypeStatusSubmittedProcessed
type); ?>status] ?? $r->status; ?>created, 'M d, Y H:i'); ?>processed ? HTMLHelper::_('date', $r->processed, 'M d, Y H:i') : '—'; ?>
+
+
+ + + + +
+
Consent History
+
+ + + + + + + + + + + +
CategoryActionDate
category))); ?>action); ?>created, 'M d, Y H:i'); ?>
+
+
+ +
+ + From 8cd80ae7d2fbe76cc6e79e78f87e7abb6577f518 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Wed, 3 Jun 2026 16:54:18 +0000 Subject: [PATCH 072/220] chore(version): auto-bump 02.32.41 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 00f2abbb..283bdb48 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.40 + 02.32.41 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 558fbf41..b9a1286c 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.40 +# VERSION: 02.32.41 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 7937ffe4..c1ea0b30 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.40 + VERSION: 02.32.41 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index fb1faa66..bbd72e36 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 0c38895e..de2b648c 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 5d5ee35b..38d441f8 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.40 + VERSION: 02.32.41 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index a5860c21..20da02cd 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 54a53e4f..841bc5b4 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.40 +VERSION: 02.32.41 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 13081213..af68a944 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.40) +# MokoWaaS Build Guide (VERSION: 02.32.41) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 33f7695e..8b8212f9 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.40) +# MokoWaaS Configuration Guide (VERSION: 02.32.41) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index c44236ae..912c7471 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.40) +# MokoWaaS Installation Guide (VERSION: 02.32.41) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 9bf3772d..ec3bee34 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.40) +# MokoWaaS Operations Guide (VERSION: 02.32.41) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index a1ef835c..d99a9d20 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.40) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.41) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index f7987e82..58f6f952 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.40) +# MokoWaaS Testing Guide (VERSION: 02.32.41) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index e743fb09..9713a69a 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.40) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.41) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index f19a06e9..7e027713 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.40) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.41) ## Introduction diff --git a/docs/index.md b/docs/index.md index bf1b4891..053e3c8d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.40 + VERSION: 02.32.41 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.40) +# MokoWaaS Documentation Index (VERSION: 02.32.41) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index b7ec2ea5..464cb298 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.40 + VERSION: 02.32.41 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.40) +# MokoWaaS Plugin Overview (VERSION: 02.32.41) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 5fe6d02a..c345eca5 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.40 +VERSION: 02.32.41 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2168186e..9496378c 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index b9446382..4f307bc9 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index e25a820b..42be3828 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index e3844ca5..ff77157f 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index fa01b100..7ea234af 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 0a98d67c..78edec3d 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 9d1495e2..7e8b6cf4 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index cd6b0741..5c8b85f5 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index f9c14fbc..3d23d22b 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 4119cdaf..740b4ac3 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.40 + * VERSION: 02.32.41 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 878062a9..11e855c9 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.40 + * VERSION: 02.32.41 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index cba69d60..f5b6925a 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.40 + * VERSION: 02.32.41 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 5dbc5b5d..041079fd 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 4fa87e17..74ea2d86 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index c1ba2fb8..680d538e 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.40 + * VERSION: 02.32.41 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index c7196de9..b962db0f 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 5f4725db..f2b25dfb 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 4b6a111c..398dfbfd 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 3c21e91a..73b30ffd 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 1702ba1f..dbf49c94 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 7db32cb6..a35f66c7 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 368004e9..60f1c982 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 - 02.32.40 + 02.32.41 + 02.32.41 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 5226893b..d6417524 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 + 02.32.41 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 2452bed9..26eb4a0b 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 - 02.32.40 + 02.32.41 + 02.32.41 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 2d161e68..71f59e85 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.40 - 02.32.40 + 02.32.41 + 02.32.41 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 918265e2..34e6b7de 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.40 + * VERSION: 02.32.41 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index cbeaec18..eb9afdd7 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.40 + * VERSION: 02.32.41 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index ee9c5074..123ffa95 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.40 + 02.32.41 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 579b5200..65392cd5 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From d22d470aa229e7968ee9b67d9fe43106e9d34d5b Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Wed, 3 Jun 2026 16:54:19 +0000 Subject: [PATCH 073/220] chore: update development channel 02.32.41 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 65392cd5..bab4ae75 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.40-dev + 02.32.41-dev 2026-06-03 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.40-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.41-dev.zip - ca582f5e1b524414d896b5b749d0ad004cff8b83f1e9d5a85d85f447d8de78dd + 17a2b862b697133b67847c9776f822a5b519b04fd87c457686e3cb5e78dde077 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 8f936fc92cc1b43924f6f7640749d455eca80b8f Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Wed, 3 Jun 2026 23:42:18 -0500 Subject: [PATCH 074/220] feat: WAF log viewer with filters, one-click ban, and purge (#144) Admin view at MokoWaaS > WAF Log: - Rule distribution cards showing block counts per shield - Filterable log table: rule, IP, search (URI/detail/UA), date range - Pagination (50 per page) - One-click IP ban from any log entry or top IPs sidebar - Top 10 blocked IPs sidebar with ban buttons - Purge old logs (configurable days) - Color-coded rule badges (sqli=red, xss=red, mua=yellow, etc.) WaflogModel: - getLogs with filters + pagination - getTotal for page count - getRuleCounts for distribution cards - getTopIps for sidebar - getRuleNames for filter dropdown - purgeLogs(days) with affected count - banIp adds to firewall plugin IP blocklist params ACL: core.admin (Super Users only) Submenu: MokoWaaS > WAF Log Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/language/en-GB/com_mokowaas.sys.ini | 1 + .../src/Controller/DisplayController.php | 35 +++ .../admin/src/Model/WaflogModel.php | 215 ++++++++++++++++++ .../admin/src/View/Waflog/HtmlView.php | 55 +++++ .../admin/tmpl/waflog/default.php | 212 +++++++++++++++++ src/packages/com_mokowaas/mokowaas.xml | 1 + 6 files changed, 519 insertions(+) create mode 100644 src/packages/com_mokowaas/admin/src/Model/WaflogModel.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Waflog/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/waflog/default.php diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini index e5da7db4..0218a06c 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini @@ -13,4 +13,5 @@ COM_MOKOWAAS_MENU_CHECKIN="Global Check-in" COM_MOKOWAAS_MENU_TICKETS="Helpdesk" COM_MOKOWAAS_MENU_HTACCESS=".htaccess Maker" COM_MOKOWAAS_MENU_PRIVACY="Privacy Guard" +COM_MOKOWAAS_MENU_WAFLOG="WAF Log" COM_MOKOWAAS_MENU_CACHE="Cache Management" diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index 648340a8..e7696638 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -30,6 +30,7 @@ class DisplayController extends BaseController 'tickets' => 'mokowaas.tickets', 'ticket' => 'mokowaas.tickets', 'privacy' => 'core.admin', + 'waflog' => 'core.admin', ]; public function display($cachable = false, $urlparams = []) @@ -269,6 +270,40 @@ class DisplayController extends BaseController } } + // ================================================================== + // WAF Log + // ================================================================== + + public function purgeWafLog() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + if (!$this->checkAcl('core.admin')) + { + $this->jsonForbidden(); + } + + $days = Factory::getApplication()->getInput()->getInt('days', 30); + $model = new \Moko\Component\MokoWaaS\Administrator\Model\WaflogModel(); + + $this->jsonResponse($model->purgeLogs($days)); + } + + public function banIpFromLog() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + if (!$this->checkAcl('core.admin')) + { + $this->jsonForbidden(); + } + + $ip = Factory::getApplication()->getInput()->getString('ip', ''); + $model = new \Moko\Component\MokoWaaS\Administrator\Model\WaflogModel(); + + $this->jsonResponse($model->banIp($ip)); + } + // ================================================================== // Privacy Guard // ================================================================== diff --git a/src/packages/com_mokowaas/admin/src/Model/WaflogModel.php b/src/packages/com_mokowaas/admin/src/Model/WaflogModel.php new file mode 100644 index 00000000..591ba310 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/Model/WaflogModel.php @@ -0,0 +1,215 @@ +getDatabase(); + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_waf_log')); + + if (!empty($filters['rule'])) + { + $query->where($db->quoteName('rule') . ' = ' . $db->quote($filters['rule'])); + } + + if (!empty($filters['ip'])) + { + $query->where($db->quoteName('ip') . ' LIKE ' . $db->quote('%' . $db->escape($filters['ip'], true) . '%')); + } + + if (!empty($filters['search'])) + { + $search = $db->quote('%' . $db->escape($filters['search'], true) . '%'); + $query->where('(' . $db->quoteName('uri') . ' LIKE ' . $search + . ' OR ' . $db->quoteName('detail') . ' LIKE ' . $search + . ' OR ' . $db->quoteName('user_agent') . ' LIKE ' . $search . ')'); + } + + if (!empty($filters['date_from'])) + { + $query->where($db->quoteName('created') . ' >= ' . $db->quote($filters['date_from'] . ' 00:00:00')); + } + + if (!empty($filters['date_to'])) + { + $query->where($db->quoteName('created') . ' <= ' . $db->quote($filters['date_to'] . ' 23:59:59')); + } + + $query->order($db->quoteName('created') . ' DESC'); + $query->setLimit($limit, $offset); + + $db->setQuery($query); + + return $db->loadObjectList() ?: []; + } + + /** + * Get total count for pagination. + */ + public function getTotal(array $filters = []): int + { + $db = $this->getDatabase(); + $query = $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__mokowaas_waf_log')); + + if (!empty($filters['rule'])) + { + $query->where($db->quoteName('rule') . ' = ' . $db->quote($filters['rule'])); + } + + if (!empty($filters['ip'])) + { + $query->where($db->quoteName('ip') . ' LIKE ' . $db->quote('%' . $db->escape($filters['ip'], true) . '%')); + } + + $db->setQuery($query); + + return (int) $db->loadResult(); + } + + /** + * Get block counts grouped by rule for the summary bar. + */ + public function getRuleCounts(): array + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select([$db->quoteName('rule'), 'COUNT(*) AS ' . $db->quoteName('cnt')]) + ->from($db->quoteName('#__mokowaas_waf_log')) + ->group($db->quoteName('rule')) + ->order($db->quoteName('cnt') . ' DESC') + ); + + return $db->loadObjectList() ?: []; + } + + /** + * Get top blocked IPs. + */ + public function getTopIps(int $limit = 10): array + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select([$db->quoteName('ip'), 'COUNT(*) AS ' . $db->quoteName('cnt'), + 'MAX(' . $db->quoteName('created') . ') AS ' . $db->quoteName('last_seen')]) + ->from($db->quoteName('#__mokowaas_waf_log')) + ->group($db->quoteName('ip')) + ->order($db->quoteName('cnt') . ' DESC') + ->setLimit($limit) + ); + + return $db->loadObjectList() ?: []; + } + + /** + * Get distinct rule names for the filter dropdown. + */ + public function getRuleNames(): array + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->select('DISTINCT ' . $db->quoteName('rule')) + ->from($db->quoteName('#__mokowaas_waf_log')) + ->order($db->quoteName('rule') . ' ASC') + ); + + return $db->loadColumn() ?: []; + } + + /** + * Delete logs older than N days. + */ + public function purgeLogs(int $days): array + { + try + { + $db = $this->getDatabase(); + $cutoff = Factory::getDate('-' . $days . ' days')->toSql(); + + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__mokowaas_waf_log')) + ->where($db->quoteName('created') . ' < ' . $db->quote($cutoff)) + )->execute(); + + $count = $db->getAffectedRows(); + + return ['success' => true, 'message' => "Purged {$count} log entries older than {$days} days."]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Purge failed: ' . $e->getMessage()]; + } + } + + /** + * Add an IP to the firewall blocklist. + */ + public function banIp(string $ip, string $reason = 'Banned from WAF log'): array + { + try + { + $db = $this->getDatabase(); + + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas_firewall')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')); + $db->setQuery($query); + + $params = new \Joomla\Registry\Registry($db->loadResult() ?? '{}'); + $blocklist = json_decode($params->get('ip_blocklist', '[]'), true) ?: []; + + // Check if already blocked + foreach ($blocklist as $entry) + { + if (($entry['ip'] ?? '') === $ip) + { + return ['success' => false, 'message' => $ip . ' is already blocked.']; + } + } + + $blocklist[] = ['ip' => $ip, 'enabled' => '1', 'label' => $reason]; + $params->set('ip_blocklist', json_encode($blocklist)); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($params->toString())) + ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas_firewall')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')) + )->execute(); + + return ['success' => true, 'message' => $ip . ' has been added to the IP blocklist.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Ban failed: ' . $e->getMessage()]; + } + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Waflog/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Waflog/HtmlView.php new file mode 100644 index 00000000..e1f73a9c --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Waflog/HtmlView.php @@ -0,0 +1,55 @@ +getInput(); + + $this->filters = [ + 'rule' => $input->getString('filter_rule', ''), + 'ip' => $input->getString('filter_ip', ''), + 'search' => $input->getString('filter_search', ''), + 'date_from' => $input->getString('filter_date_from', ''), + 'date_to' => $input->getString('filter_date_to', ''), + ]; + + $page = max(1, $input->getInt('page', 1)); + $limit = 50; + $offset = ($page - 1) * $limit; + + $this->logs = $model->getLogs($this->filters, $limit, $offset); + $this->total = $model->getTotal($this->filters); + $this->ruleCounts = $model->getRuleCounts(); + $this->topIps = $model->getTopIps(10); + $this->ruleNames = $model->getRuleNames(); + + $this->addToolbar(); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } + + protected function addToolbar(): void + { + ToolbarHelper::title('WAF Log Viewer', 'shield-alt'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas'); + } +} diff --git a/src/packages/com_mokowaas/admin/tmpl/waflog/default.php b/src/packages/com_mokowaas/admin/tmpl/waflog/default.php new file mode 100644 index 00000000..4fab7ab2 --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/waflog/default.php @@ -0,0 +1,212 @@ +logs; +$ruleCounts = $this->ruleCounts; +$topIps = $this->topIps; +$ruleNames = $this->ruleNames; +$total = $this->total; +$filters = $this->filters; +$token = Session::getFormToken(); +$input = Factory::getApplication()->getInput(); +$page = max(1, $input->getInt('page', 1)); +$totalPages = max(1, ceil($total / 50)); + +$ruleBadge = [ + 'sqli' => 'bg-danger', 'xss' => 'bg-danger', 'mua' => 'bg-warning text-dark', + 'rfi' => 'bg-danger', 'dfi' => 'bg-danger', 'blocked_file' => 'bg-info', + 'blocked_php' => 'bg-info', 'tmpl_switch' => 'bg-secondary', + 'ip_blocklist' => 'bg-dark', 'admin_secret' => 'bg-dark', +]; +?> + +
+ +
+ +
+ rule); ?> + cnt); ?> +
+ +
+ Total + +
+
+ +
+ +
+ +
+
+ + +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ + Reset +
+
+
+
+ + +
+
+ blocked requests + +
+
+ + + + + + + + + + + + + + + + + + + + + +
TimeIPRuleURIDetailUser Agent
No blocked requests found.
created, 'M d H:i:s'); ?>ip); ?>rule); ?>uri, 0, 60)); ?>detail, 0, 50)); ?>user_agent, 0, 40)); ?> + +
+
+ + 1): ?> +
+ Page of + +
+ +
+
+ + +
+
+
Top Blocked IPs
+
+ + + + + + + + + + + + +
IPBlocksLast
ip); ?>cnt; ?>last_seen, 'M d'); ?> + +
+
+
+
+
+
+ + diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2168186e..cd71e421 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -33,6 +33,7 @@ COM_MOKOWAAS_MENU_TICKETS COM_MOKOWAAS_MENU_HTACCESS COM_MOKOWAAS_MENU_PRIVACY + COM_MOKOWAAS_MENU_WAFLOG COM_MOKOWAAS_MENU_PLUGINS COM_MOKOWAAS_MENU_UPDATES COM_MOKOWAAS_MENU_CHECKIN From 4b4d5c714bdc96e0bbad9f3a51c8a2b1828ebf2e Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 04:42:48 +0000 Subject: [PATCH 075/220] chore(version): auto-bump 02.32.42 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 283bdb48..7be3ed0f 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.41 + 02.32.42 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index b9a1286c..8bf71ac5 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.41 +# VERSION: 02.32.42 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index c1ea0b30..09f4a523 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.41 + VERSION: 02.32.42 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index bbd72e36..7c50ec2c 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index de2b648c..11cf2a42 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 38d441f8..11be037f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.41 + VERSION: 02.32.42 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 20da02cd..e6e9cb0e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 841bc5b4..26c26cad 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.41 +VERSION: 02.32.42 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index af68a944..b176c6cd 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.41) +# MokoWaaS Build Guide (VERSION: 02.32.42) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 8b8212f9..fb802526 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.41) +# MokoWaaS Configuration Guide (VERSION: 02.32.42) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 912c7471..aa60849c 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.41) +# MokoWaaS Installation Guide (VERSION: 02.32.42) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index ec3bee34..fbdbc0c8 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.41) +# MokoWaaS Operations Guide (VERSION: 02.32.42) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d99a9d20..e0fe5b91 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.41) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.42) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 58f6f952..f416cd80 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.41) +# MokoWaaS Testing Guide (VERSION: 02.32.42) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 9713a69a..5d176a33 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.41) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.42) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 7e027713..bdc83b65 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.41) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.42) ## Introduction diff --git a/docs/index.md b/docs/index.md index 053e3c8d..21500b3d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.41 + VERSION: 02.32.42 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.41) +# MokoWaaS Documentation Index (VERSION: 02.32.42) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 464cb298..f280cb53 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.41 + VERSION: 02.32.42 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.41) +# MokoWaaS Plugin Overview (VERSION: 02.32.42) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index c345eca5..3aa608e5 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.41 +VERSION: 02.32.42 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 382fd34b..1884f30e 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 4f307bc9..d7e491e0 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 42be3828..a99f291e 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index ff77157f..27e1585e 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 7ea234af..71d6e986 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 78edec3d..18c6a84f 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 7e8b6cf4..70809200 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 5c8b85f5..a3ad13f1 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 3d23d22b..d82e3839 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 740b4ac3..1bdf3bef 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.41 + * VERSION: 02.32.42 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 11e855c9..e1572204 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.41 + * VERSION: 02.32.42 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index f5b6925a..2eee0792 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.41 + * VERSION: 02.32.42 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 041079fd..2c0b6021 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 74ea2d86..00b9298b 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 680d538e..0cfa9bb8 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.41 + * VERSION: 02.32.42 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index b962db0f..2ba36c97 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index f2b25dfb..b2ebc922 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 398dfbfd..71f58215 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 73b30ffd..4ae5b46d 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index dbf49c94..323d6951 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index a35f66c7..651177a8 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 60f1c982..2c4d1efa 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 - 02.32.41 + 02.32.42 + 02.32.42 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index d6417524..8f484f36 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 + 02.32.42 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 26eb4a0b..dd7586b7 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 - 02.32.41 + 02.32.42 + 02.32.42 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 71f59e85..01a68335 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.41 - 02.32.41 + 02.32.42 + 02.32.42 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 34e6b7de..ad5a0913 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.41 + * VERSION: 02.32.42 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index eb9afdd7..1e1464a3 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.41 + * VERSION: 02.32.42 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 123ffa95..a69d31dd 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.41 + 02.32.42 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index bab4ae75..c280d29d 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 46a9701b62d72bfafd4930fc33b43128655b9d36 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 04:42:49 +0000 Subject: [PATCH 076/220] chore: update development channel 02.32.42 [skip ci] --- updates.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/updates.xml b/updates.xml index c280d29d..a0a60f7d 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.41-dev - 2026-06-03 + 02.32.42-dev + 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.41-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.42-dev.zip - 17a2b862b697133b67847c9776f822a5b519b04fd87c457686e3cb5e78dde077 + 20622e59c5d1c903f6368c61936fd79c801323c023bd59882e42f2b47875685d dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 2919722daba67ed33f1be120d6bebf727e9ace6b Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 06:44:14 -0500 Subject: [PATCH 077/220] =?UTF-8?q?feat:=20Part=201=20batch=20=E2=80=94=20?= =?UTF-8?q?security=20headers,=20auto-ban,=20SSL=20monitor,=20IP=20display?= =?UTF-8?q?,=20settings=20export?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #118 Display current IP on dashboard info bar #124 HTTP security headers at runtime (X-Frame, X-Content-Type, X-XSS, Referrer-Policy, HSTS, CSP, Permissions-Policy) — new firewall fieldset with per-header toggles #143 WAF auto-ban: threshold + window params, auto-adds to IP blocklist after N blocks in M minutes #148 SSL certificate expiry monitoring in cpanel module (green/yellow/red badge with days remaining) #132 Settings import/export — export all plugin + component params as JSON, import on another site Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Controller/DisplayController.php | 98 +++++++++++++ .../admin/tmpl/dashboard/default.php | 4 + .../src/Dispatcher/Dispatcher.php | 1 + .../src/Helper/CpanelHelper.php | 50 +++++++ .../mod_mokowaas_cpanel/tmpl/default.php | 6 + .../mokowaas_firewall.xml | 57 ++++++++ .../src/Extension/Firewall.php | 132 +++++++++++++++++- 7 files changed, 347 insertions(+), 1 deletion(-) diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index e7696638..e910b66c 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -270,6 +270,104 @@ class DisplayController extends BaseController } } + // ================================================================== + // Settings Import/Export (#132) + // ================================================================== + + public function exportSettings() + { + if (!$this->checkAcl('core.admin')) + { + $this->jsonForbidden(); + } + + $db = Factory::getDbo(); + $settings = []; + + // Export all MokoWaaS plugin params + $plugins = ['mokowaas', 'mokowaas_firewall', 'mokowaas_tenant', 'mokowaas_devtools', 'mokowaas_offline']; + + foreach ($plugins as $element) + { + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote($element)) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')) + ); + $settings['plugins'][$element] = json_decode($db->loadResult() ?? '{}', true); + } + + // Export component params + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + ); + $settings['component'] = json_decode($db->loadResult() ?? '{}', true); + $settings['exported'] = gmdate('Y-m-d\TH:i:s\Z'); + $settings['site'] = Factory::getConfig()->get('sitename', ''); + + $this->jsonResponse(['success' => true, 'settings' => $settings]); + } + + public function importSettings() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + + if (!$this->checkAcl('core.admin')) + { + $this->jsonForbidden(); + } + + $json = Factory::getApplication()->getInput()->getRaw('settings_json', ''); + $data = json_decode($json, true); + + if (empty($data) || empty($data['plugins'])) + { + $this->jsonResponse(['success' => false, 'message' => 'Invalid settings JSON.']); + } + + $db = Factory::getDbo(); + $count = 0; + + foreach ($data['plugins'] ?? [] as $element => $params) + { + if (!is_array($params)) + { + continue; + } + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($params))) + ->where($db->quoteName('element') . ' = ' . $db->quote($element)) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')) + )->execute(); + $count++; + } + + if (!empty($data['component']) && is_array($data['component'])) + { + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($data['component']))) + ->where($db->quoteName('element') . ' = ' . $db->quote('com_mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('component')) + )->execute(); + $count++; + } + + $this->jsonResponse(['success' => true, 'message' => "Imported settings for {$count} extensions."]); + } + // ================================================================== // WAF Log // ================================================================== diff --git a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php index 4da50048..186ad4f0 100644 --- a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php @@ -65,6 +65,10 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api']; offline): ?> +
+ + escape($_SERVER['REMOTE_ADDR'] ?? ''); ?> +
diff --git a/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php b/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php index d3b1c191..d5b14142 100644 --- a/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php +++ b/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php @@ -33,6 +33,7 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI $data['counts'] = $helper->getCounts($db); $data['disk'] = $helper->getDiskInfo(); $data['currentIp'] = $helper->getCurrentIp(); + $data['ssl'] = $helper->getSslStatus(); return $data; } diff --git a/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php b/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php index 7160329e..a50d895e 100644 --- a/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php +++ b/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php @@ -136,4 +136,54 @@ class CpanelHelper { return $_SERVER['REMOTE_ADDR'] ?? ''; } + + /** + * Check SSL certificate expiry (#148). + * + * @return object|null {expires, days_remaining, warning} or null if check fails + */ + public function getSslStatus(): ?object + { + try + { + $host = parse_url(\Joomla\CMS\Uri\Uri::root(), PHP_URL_HOST); + + if (empty($host)) + { + return null; + } + + $context = stream_context_create(['ssl' => ['capture_peer_cert' => true, 'verify_peer' => false]]); + $client = @stream_socket_client('ssl://' . $host . ':443', $errno, $errstr, 5, STREAM_CLIENT_CONNECT, $context); + + if (!$client) + { + return null; + } + + $params = stream_context_get_params($client); + fclose($client); + + $cert = openssl_x509_parse($params['options']['ssl']['peer_certificate'] ?? ''); + + if (empty($cert['validTo_time_t'])) + { + return null; + } + + $expires = $cert['validTo_time_t']; + $days = (int) floor(($expires - time()) / 86400); + + return (object) [ + 'expires' => date('Y-m-d', $expires), + 'days_remaining' => $days, + 'warning' => $days <= 30, + 'critical' => $days <= 7, + ]; + } + catch (\Throwable $e) + { + return null; + } + } } diff --git a/src/packages/mod_mokowaas_cpanel/tmpl/default.php b/src/packages/mod_mokowaas_cpanel/tmpl/default.php index b3ed62f2..a65553f5 100644 --- a/src/packages/mod_mokowaas_cpanel/tmpl/default.php +++ b/src/packages/mod_mokowaas_cpanel/tmpl/default.php @@ -130,6 +130,12 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !== + + + + SSL days_remaining; ?>d + + Jjoomla_version ?? ''); ?> / PHP php_version ?? ''); ?> diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index f2b25dfb..b67360d2 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -127,6 +127,53 @@
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + + + checkDirectPhpAccess(); } - // Existing features + // Security headers + existing features + $this->injectSecurityHeaders(); $this->enforceHttps(); $this->enforceUploadRestrictions(); @@ -400,6 +401,28 @@ class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensi 'created' => gmdate('Y-m-d H:i:s'), ]; $db->insertObject('#__mokowaas_waf_log', $row); + + // Auto-ban: if IP has N+ blocks in last M minutes, add to blocklist (#143) + $threshold = (int) $this->params->get('autoban_threshold', 10); + $window = (int) $this->params->get('autoban_window', 5); + + if ($threshold > 0 && $window > 0) + { + $cutoff = gmdate('Y-m-d H:i:s', time() - ($window * 60)); + $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__mokowaas_waf_log')) + ->where($db->quoteName('ip') . ' = ' . $db->quote($ip)) + ->where($db->quoteName('created') . ' >= ' . $db->quote($cutoff)) + ); + $recentBlocks = (int) $db->loadResult(); + + if ($recentBlocks >= $threshold) + { + $this->autoBanIp($ip, $db); + } + } } catch (\Throwable $e) { @@ -418,6 +441,51 @@ class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensi // Input Scanning // ================================================================== + /** + * Auto-ban an IP by adding it to the blocklist params (#143). + */ + private function autoBanIp(string $ip, $db): void + { + try + { + $query = $db->getQuery(true) + ->select($db->quoteName('params')) + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas_firewall')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')); + $db->setQuery($query); + $params = new \Joomla\Registry\Registry($db->loadResult() ?? '{}'); + $blocklist = json_decode($params->get('ip_blocklist', '[]'), true) ?: []; + + foreach ($blocklist as $entry) + { + if (($entry['ip'] ?? '') === $ip) + { + return; + } + } + + $blocklist[] = ['ip' => $ip, 'enabled' => '1', 'label' => 'Auto-banned by WAF (' . gmdate('Y-m-d H:i') . ')']; + $params->set('ip_blocklist', json_encode($blocklist)); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('params') . ' = ' . $db->quote($params->toString())) + ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas_firewall')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')) + ->where($db->quoteName('folder') . ' = ' . $db->quote('system')) + )->execute(); + + Log::add('WAF auto-banned IP: ' . $ip, Log::WARNING, 'mokowaas'); + } + catch (\Throwable $e) + { + // Silent + } + } + private function scanInput(array $input, string $pattern): ?string { foreach ($input as $key => $value) @@ -547,6 +615,68 @@ class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensi } } + /** + * Inject HTTP security headers at runtime (#124). + */ + private function injectSecurityHeaders(): void + { + $app = $this->getApplication(); + + if ($app->isClient('cli')) + { + return; + } + + if ($this->params->get('header_xframe', 1)) + { + $app->setHeader('X-Frame-Options', 'SAMEORIGIN', true); + } + + if ($this->params->get('header_xcontent', 1)) + { + $app->setHeader('X-Content-Type-Options', 'nosniff', true); + } + + if ($this->params->get('header_xxss', 1)) + { + $app->setHeader('X-XSS-Protection', '1; mode=block', true); + } + + $referrer = $this->params->get('header_referrer', ''); + + if (!empty($referrer) && $referrer !== 'off') + { + $app->setHeader('Referrer-Policy', $referrer, true); + } + + if ($this->params->get('header_hsts', 0)) + { + $maxAge = (int) $this->params->get('header_hsts_maxage', 31536000); + $hsts = 'max-age=' . $maxAge; + + if ($this->params->get('header_hsts_subdomains', 0)) + { + $hsts .= '; includeSubDomains'; + } + + $app->setHeader('Strict-Transport-Security', $hsts, true); + } + + $csp = $this->params->get('header_csp', ''); + + if (!empty($csp)) + { + $app->setHeader('Content-Security-Policy', $csp, true); + } + + $perms = $this->params->get('header_permissions', ''); + + if (!empty($perms)) + { + $app->setHeader('Permissions-Policy', $perms, true); + } + } + private function enforceHttps(): void { if (!$this->params->get('force_https', 0)) From abd7a4a35ed4108730bde50e19a0a7bc5e1b8a52 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 11:44:52 +0000 Subject: [PATCH 078/220] chore(version): auto-bump 02.32.43 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 7be3ed0f..93018e63 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.42 + 02.32.43 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 8bf71ac5..810b4ce6 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.42 +# VERSION: 02.32.43 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 09f4a523..b23abf7e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.42 + VERSION: 02.32.43 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7c50ec2c..eca045ee 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 11cf2a42..8178c6c9 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 11be037f..367b94ea 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.42 + VERSION: 02.32.43 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index e6e9cb0e..f315f327 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 26c26cad..6f33bd0a 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.42 +VERSION: 02.32.43 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index b176c6cd..769fcf13 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.42) +# MokoWaaS Build Guide (VERSION: 02.32.43) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index fb802526..4dcf65d9 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.42) +# MokoWaaS Configuration Guide (VERSION: 02.32.43) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index aa60849c..c2fc2471 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.42) +# MokoWaaS Installation Guide (VERSION: 02.32.43) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index fbdbc0c8..4f9df27c 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.42) +# MokoWaaS Operations Guide (VERSION: 02.32.43) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index e0fe5b91..f353228f 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.42) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.43) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index f416cd80..cad806ff 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.42) +# MokoWaaS Testing Guide (VERSION: 02.32.43) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 5d176a33..05b10121 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.42) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.43) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index bdc83b65..ffe648f3 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.42) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.43) ## Introduction diff --git a/docs/index.md b/docs/index.md index 21500b3d..265ff97c 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.42 + VERSION: 02.32.43 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.42) +# MokoWaaS Documentation Index (VERSION: 02.32.43) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index f280cb53..d771836f 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.42 + VERSION: 02.32.43 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.42) +# MokoWaaS Plugin Overview (VERSION: 02.32.43) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 3aa608e5..42e6499e 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.42 +VERSION: 02.32.43 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 1884f30e..73bb6b39 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index d7e491e0..b4652537 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index a99f291e..fb99f5f1 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 27e1585e..19c04dea 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 71d6e986..8a15cd2a 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 18c6a84f..1ac8ae04 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 70809200..a5590bf7 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index a3ad13f1..56c5ca3b 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index d82e3839..0233750d 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 1bdf3bef..d99c4323 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.42 + * VERSION: 02.32.43 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index e1572204..0862f291 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.42 + * VERSION: 02.32.43 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 2eee0792..e1f82a5b 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.42 + * VERSION: 02.32.43 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 2c0b6021..5de885a2 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 00b9298b..952e13ce 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 0cfa9bb8..e9e05933 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.42 + * VERSION: 02.32.43 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 2ba36c97..d9e48b0e 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 96f00eaf..b5d8e232 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 71f58215..c11d81a1 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 4ae5b46d..87d9519a 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 323d6951..41c2f89d 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 651177a8..2b4ba281 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 2c4d1efa..c64c58ec 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 - 02.32.42 + 02.32.43 + 02.32.43 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 8f484f36..0cca2d2a 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 + 02.32.43 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index dd7586b7..e21da50e 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 - 02.32.42 + 02.32.43 + 02.32.43 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 01a68335..cb23c016 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.42 - 02.32.42 + 02.32.43 + 02.32.43 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index ad5a0913..f75904cb 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.42 + * VERSION: 02.32.43 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 1e1464a3..3f385645 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.42 + * VERSION: 02.32.43 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index a69d31dd..a3ca35a8 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.42 + 02.32.43 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index a0a60f7d..85222d73 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 6ca195fd9ffaf1ca60e9ba70853ad08858736672 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 11:44:54 +0000 Subject: [PATCH 079/220] chore: update development channel 02.32.43 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 85222d73..cb54b49f 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.42-dev + 02.32.43-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.42-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.43-dev.zip - 20622e59c5d1c903f6368c61936fd79c801323c023bd59882e42f2b47875685d + 21ee0054559208a3bee003c5913bfbdfaf211ee252c19c0988cdb8123b49dfc9 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From d3561dd5c99418c57e70e0f4d91bb96d361fad7a Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:01:46 -0500 Subject: [PATCH 080/220] =?UTF-8?q?feat:=20Part=201=20batch=202=20?= =?UTF-8?q?=E2=80=94=20helpdesk=20admin=20UIs=20(#137,=20#138,=20#139)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ticket Categories admin (view=categories): - Inline editable table with SLA times, auto-assign user - Add/save/delete with AJAX - SLA response + resolution minutes per category Canned Responses admin (view=canned): - Card list with title + preview - Modal form for new responses with category filter - Delete with AJAX Automation Rules admin (view=automation): - Card list with conditions + actions displayed inline - Enable/disable toggle per rule - Modal form with trigger, conditions JSON, actions JSON - Delete with AJAX Controller tasks: saveCategory, deleteCategory, saveCanned, deleteCanned, saveAutomation, deleteAutomation, toggleAutomation All ACL-protected (tickets ACL for categories/canned, core.admin for automation rules). Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Controller/DisplayController.php | 109 ++++++++++++++ .../admin/src/View/Automation/HtmlView.php | 27 ++++ .../admin/src/View/Canned/HtmlView.php | 33 ++++ .../admin/src/View/Categories/HtmlView.php | 41 +++++ .../admin/tmpl/automation/default.php | 141 ++++++++++++++++++ .../admin/tmpl/canned/default.php | 107 +++++++++++++ .../admin/tmpl/categories/default.php | 126 ++++++++++++++++ 7 files changed, 584 insertions(+) create mode 100644 src/packages/com_mokowaas/admin/src/View/Automation/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Canned/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Categories/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/automation/default.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/canned/default.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/categories/default.php diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index e910b66c..5d2f30ca 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -31,6 +31,9 @@ class DisplayController extends BaseController 'ticket' => 'mokowaas.tickets', 'privacy' => 'core.admin', 'waflog' => 'core.admin', + 'categories' => 'mokowaas.tickets', + 'canned' => 'mokowaas.tickets', + 'automation' => 'core.admin', ]; public function display($cachable = false, $urlparams = []) @@ -270,6 +273,112 @@ class DisplayController extends BaseController } } + // ================================================================== + // Helpdesk CRUD (#137, #138, #139) + // ================================================================== + + public function saveCategory() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('mokowaas.tickets')) { $this->jsonForbidden(); } + $input = Factory::getApplication()->getInput(); + $db = Factory::getDbo(); + $id = $input->getInt('id', 0); + $data = (object) [ + 'title' => $input->getString('title', ''), + 'alias' => \Joomla\CMS\Filter\OutputFilter::stringURLSafe($input->getString('title', '')), + 'sla_response_minutes' => $input->getInt('sla_response_minutes', 480), + 'sla_resolution_minutes' => $input->getInt('sla_resolution_minutes', 2880), + 'auto_assign_user' => $input->getInt('auto_assign_user', 0) ?: null, + 'published' => $input->getInt('published', 1), + ]; + if ($id) { + $data->id = $id; + $db->updateObject('#__mokowaas_ticket_categories', $data, 'id'); + } else { + $data->ordering = 0; + $db->insertObject('#__mokowaas_ticket_categories', $data, 'id'); + } + $this->jsonResponse(['success' => true, 'message' => 'Category saved.', 'id' => (int) $data->id]); + } + + public function deleteCategory() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('mokowaas.tickets')) { $this->jsonForbidden(); } + $db = Factory::getDbo(); + $db->setQuery($db->getQuery(true)->delete('#__mokowaas_ticket_categories')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute(); + $this->jsonResponse(['success' => true, 'message' => 'Category deleted.']); + } + + public function saveCanned() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('mokowaas.tickets')) { $this->jsonForbidden(); } + $input = Factory::getApplication()->getInput(); + $db = Factory::getDbo(); + $data = (object) [ + 'title' => $input->getString('title', ''), + 'body' => $input->getRaw('body', ''), + 'category_id' => $input->getInt('category_id', 0) ?: null, + 'ordering' => 0, + ]; + $id = $input->getInt('id', 0); + if ($id) { $data->id = $id; $db->updateObject('#__mokowaas_ticket_canned', $data, 'id'); } + else { $db->insertObject('#__mokowaas_ticket_canned', $data, 'id'); } + $this->jsonResponse(['success' => true, 'message' => 'Canned response saved.', 'id' => (int) $data->id]); + } + + public function deleteCanned() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('mokowaas.tickets')) { $this->jsonForbidden(); } + $db = Factory::getDbo(); + $db->setQuery($db->getQuery(true)->delete('#__mokowaas_ticket_canned')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute(); + $this->jsonResponse(['success' => true, 'message' => 'Canned response deleted.']); + } + + public function saveAutomation() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); } + $input = Factory::getApplication()->getInput(); + $db = Factory::getDbo(); + $data = (object) [ + 'title' => $input->getString('title', ''), + 'trigger_event' => $input->getString('trigger_event', 'ticket_created'), + 'conditions' => $input->getRaw('conditions', '[]'), + 'actions' => $input->getRaw('actions', '[]'), + 'enabled' => 1, + 'ordering' => 0, + ]; + $id = $input->getInt('id', 0); + if ($id) { $data->id = $id; $db->updateObject('#__mokowaas_ticket_automation', $data, 'id'); } + else { $db->insertObject('#__mokowaas_ticket_automation', $data, 'id'); } + $this->jsonResponse(['success' => true, 'message' => 'Rule saved.', 'id' => (int) $data->id]); + } + + public function deleteAutomation() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); } + $db = Factory::getDbo(); + $db->setQuery($db->getQuery(true)->delete('#__mokowaas_ticket_automation')->where('id = ' . Factory::getApplication()->getInput()->getInt('id', 0)))->execute(); + $this->jsonResponse(['success' => true, 'message' => 'Rule deleted.']); + } + + public function toggleAutomation() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); } + $input = Factory::getApplication()->getInput(); + $db = Factory::getDbo(); + $db->setQuery($db->getQuery(true)->update('#__mokowaas_ticket_automation') + ->set('enabled = ' . $input->getInt('enabled', 0)) + ->where('id = ' . $input->getInt('id', 0)))->execute(); + $this->jsonResponse(['success' => true, 'message' => 'Rule updated.']); + } + // ================================================================== // Settings Import/Export (#132) // ================================================================== diff --git a/src/packages/com_mokowaas/admin/src/View/Automation/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Automation/HtmlView.php new file mode 100644 index 00000000..01928e4a --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Automation/HtmlView.php @@ -0,0 +1,27 @@ +rules = $model->getAutomationRules(); + + ToolbarHelper::title('Automation Rules', 'cogs'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas&view=tickets'); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Canned/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Canned/HtmlView.php new file mode 100644 index 00000000..2a391df2 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Canned/HtmlView.php @@ -0,0 +1,33 @@ +get('Joomla\Database\DatabaseInterface'); + + $db->setQuery('SELECT * FROM #__mokowaas_ticket_canned ORDER BY ordering ASC'); + $this->responses = $db->loadObjectList() ?: []; + + $db->setQuery('SELECT id, title FROM #__mokowaas_ticket_categories WHERE published = 1 ORDER BY ordering'); + $this->categories = $db->loadObjectList() ?: []; + + ToolbarHelper::title('Canned Responses', 'comment'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas&view=tickets'); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Categories/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Categories/HtmlView.php new file mode 100644 index 00000000..bebffae8 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Categories/HtmlView.php @@ -0,0 +1,41 @@ +get('Joomla\Database\DatabaseInterface'); + + $db->setQuery('SELECT * FROM #__mokowaas_ticket_categories ORDER BY ordering ASC'); + $this->categories = $db->loadObjectList() ?: []; + + // Get admin users for auto-assign dropdown + $db->setQuery( + $db->getQuery(true) + ->select([$db->quoteName('id'), $db->quoteName('name')]) + ->from($db->quoteName('#__users')) + ->where($db->quoteName('block') . ' = 0') + ->order($db->quoteName('name') . ' ASC') + ->setLimit(100) + ); + $this->users = $db->loadObjectList() ?: []; + + ToolbarHelper::title('Ticket Categories', 'folder'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas&view=tickets'); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/admin/tmpl/automation/default.php b/src/packages/com_mokowaas/admin/tmpl/automation/default.php new file mode 100644 index 00000000..e9fd493d --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/automation/default.php @@ -0,0 +1,141 @@ +rules; +$token = Session::getFormToken(); +$saveUrl = Route::_('index.php?option=com_mokowaas&task=display.saveAutomation&format=json'); +$deleteUrl = Route::_('index.php?option=com_mokowaas&task=display.deleteAutomation&format=json'); +$toggleUrl = Route::_('index.php?option=com_mokowaas&task=display.toggleAutomation&format=json'); + +$triggerLabels = ['ticket_created' => 'On Ticket Created', 'ticket_replied' => 'On Reply', 'status_changed' => 'On Status Change', 'scheduled' => 'Scheduled (Cron)']; +?> + +
+
+

Automation Rules

+ +
+ + + conditions, true) ?: []; $actions = json_decode($r->actions, true) ?: []; ?> +
+
+
+
+
+
+ enabled ? 'checked' : ''; ?>> +
+ title); ?> + trigger_event] ?? $r->trigger_event; ?> +
+
+ IF + $c): ?> + 0 ? ' AND ' : ''; ?> + + THEN + + = + +
+
+ +
+
+
+ + + +
No automation rules. Click "Add Rule" to create one.
+ +
+ + + + + diff --git a/src/packages/com_mokowaas/admin/tmpl/canned/default.php b/src/packages/com_mokowaas/admin/tmpl/canned/default.php new file mode 100644 index 00000000..49a2bb31 --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/canned/default.php @@ -0,0 +1,107 @@ +responses; +$categories = $this->categories; +$token = Session::getFormToken(); +$saveUrl = Route::_('index.php?option=com_mokowaas&task=display.saveCanned&format=json'); +$deleteUrl = Route::_('index.php?option=com_mokowaas&task=display.deleteCanned&format=json'); +?> + +
+
+

Canned Responses

+ +
+ + +
+
+
+
+ title); ?> +

body, 0, 150)); ?>

+
+ +
+
+
+ + + +
No canned responses yet. Click "Add Response" to create one.
+ +
+ + + + + diff --git a/src/packages/com_mokowaas/admin/tmpl/categories/default.php b/src/packages/com_mokowaas/admin/tmpl/categories/default.php new file mode 100644 index 00000000..d52cb7ac --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/categories/default.php @@ -0,0 +1,126 @@ +categories; +$users = $this->users; +$token = Session::getFormToken(); +$saveUrl = Route::_('index.php?option=com_mokowaas&task=display.saveCategory&format=json'); +$deleteUrl = Route::_('index.php?option=com_mokowaas&task=display.deleteCategory&format=json'); +?> + +
+
+

Categories

+ +
+ +
+
+ + + + + + + + + + + + + + +
TitleSLA ResponseSLA ResolutionAuto-AssignActive
min min + + + published ? 'checked' : ''; ?>> + + + +
+
+
+
+ + From 9cb49ec4b9b2aef6888b12fb4f46e6cf58ec82be Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:02:11 +0000 Subject: [PATCH 081/220] chore(version): auto-bump 02.32.44 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 48 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 93018e63..060cd028 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.43 + 02.32.44 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 810b4ce6..69982d1f 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.43 +# VERSION: 02.32.44 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index b23abf7e..e92449b5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.43 + VERSION: 02.32.44 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index eca045ee..29c754a3 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 8178c6c9..cb383f34 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 367b94ea..54b4a597 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.43 + VERSION: 02.32.44 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index f315f327..dac09e25 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 6f33bd0a..b13c36ff 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.43 +VERSION: 02.32.44 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 769fcf13..46227e5b 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.43) +# MokoWaaS Build Guide (VERSION: 02.32.44) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 4dcf65d9..0d8085a2 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.43) +# MokoWaaS Configuration Guide (VERSION: 02.32.44) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index c2fc2471..e9b56734 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.43) +# MokoWaaS Installation Guide (VERSION: 02.32.44) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 4f9df27c..d8e8b850 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.43) +# MokoWaaS Operations Guide (VERSION: 02.32.44) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index f353228f..ee6c6470 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.43) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.44) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index cad806ff..72a0c874 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.43) +# MokoWaaS Testing Guide (VERSION: 02.32.44) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 05b10121..4c1cb388 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.43) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.44) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index ffe648f3..e2eab8ad 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.43) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.44) ## Introduction diff --git a/docs/index.md b/docs/index.md index 265ff97c..a87abd1e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.43 + VERSION: 02.32.44 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.43) +# MokoWaaS Documentation Index (VERSION: 02.32.44) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index d771836f..5abd8b72 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.43 + VERSION: 02.32.44 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.43) +# MokoWaaS Plugin Overview (VERSION: 02.32.44) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 42e6499e..54915d93 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.43 +VERSION: 02.32.44 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 73bb6b39..2ffb816c 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index b4652537..96242c7f 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index fb99f5f1..9aee79ec 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 19c04dea..0186508f 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 8a15cd2a..099b6d42 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 1ac8ae04..dc713f6f 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index a5590bf7..fd8774e7 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 56c5ca3b..fdf62275 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 0233750d..5f38caae 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index d99c4323..eb59d803 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.43 + * VERSION: 02.32.44 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 0862f291..44269e11 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.43 + * VERSION: 02.32.44 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index e1f82a5b..cb276177 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.43 + * VERSION: 02.32.44 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 5de885a2..bf88c4b4 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 952e13ce..c0b766fb 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index e9e05933..6818d4b2 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.43 + * VERSION: 02.32.44 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index d9e48b0e..adf69463 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index b5d8e232..0ef3dd35 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index c11d81a1..8fb29bd1 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 87d9519a..cc62f11f 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 41c2f89d..ba2743cf 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 2b4ba281..4e19cd04 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index c64c58ec..44731c37 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 - 02.32.43 + 02.32.44 + 02.32.44 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 0cca2d2a..5d0b5d33 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 + 02.32.44 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index e21da50e..4d70ea50 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 - 02.32.43 + 02.32.44 + 02.32.44 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index cb23c016..7be75143 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.43 - 02.32.43 + 02.32.44 + 02.32.44 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index f75904cb..9573581a 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.43 + * VERSION: 02.32.44 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 3f385645..1ef40262 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.43 + * VERSION: 02.32.44 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index a3ca35a8..31c33aef 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.43 + 02.32.44 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index cb54b49f..ead07f25 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 6f7495703c442bac9a01038c27e5a93fbb6fcca3 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:02:12 +0000 Subject: [PATCH 082/220] chore: update development channel 02.32.44 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index ead07f25..7e16e7f9 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.43-dev + 02.32.44-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.43-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.44-dev.zip - 21ee0054559208a3bee003c5913bfbdfaf211ee252c19c0988cdb8123b49dfc9 + 20805af79b9be299a7665f0165dfa73bb1608e2bc6d3e9b9c08cb8842204ffe8 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 69776d9b773320c9e021b75ff6c3b05b96b6ce67 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:05:27 -0500 Subject: [PATCH 083/220] feat: MokoWaaS admin sidebar menu module (like CB's mod_cbadmin) New module mod_mokowaas_menu renders a dedicated MokoWaaS section in the admin sidebar at position=menu, ordering=0 (before CB at 1 and Joomla's mod_menu at 2). Menu items: Dashboard, Helpdesk, Extensions, .htaccess Maker, Privacy Guard, WAF Log, Feature Plugins Active state highlighting on current view. Auto-created on package install with access=Special. Added to package manifest. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../language/en-GB/mod_mokowaas_menu.ini | 1 + .../language/en-GB/mod_mokowaas_menu.sys.ini | 2 + .../mod_mokowaas_menu/mod_mokowaas_menu.xml | 24 +++++++ .../mod_mokowaas_menu/services/provider.php | 18 +++++ .../src/Dispatcher/Dispatcher.php | 14 ++++ .../mod_mokowaas_menu/tmpl/default.php | 54 +++++++++++++++ src/pkg_mokowaas.xml | 1 + src/script.php | 66 +++++++++++++++++++ 8 files changed, 180 insertions(+) create mode 100644 src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.ini create mode 100644 src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.sys.ini create mode 100644 src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml create mode 100644 src/packages/mod_mokowaas_menu/services/provider.php create mode 100644 src/packages/mod_mokowaas_menu/src/Dispatcher/Dispatcher.php create mode 100644 src/packages/mod_mokowaas_menu/tmpl/default.php diff --git a/src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.ini b/src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.ini new file mode 100644 index 00000000..dff9f13a --- /dev/null +++ b/src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.ini @@ -0,0 +1 @@ +MOD_MOKOWAAS_MENU="MokoWaaS Admin Menu" diff --git a/src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.sys.ini b/src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.sys.ini new file mode 100644 index 00000000..898a3832 --- /dev/null +++ b/src/packages/mod_mokowaas_menu/language/en-GB/mod_mokowaas_menu.sys.ini @@ -0,0 +1,2 @@ +MOD_MOKOWAAS_MENU="MokoWaaS Admin Menu" +MOD_MOKOWAAS_MENU_DESC="Dedicated MokoWaaS section in the admin sidebar menu." diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml new file mode 100644 index 00000000..59f480be --- /dev/null +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -0,0 +1,24 @@ + + + mod_mokowaas_menu + Moko Consulting + 2026-06-04 + Copyright (C) 2026 Moko Consulting. All rights reserved. + GPL-3.0-or-later + hello@mokoconsulting.tech + https://mokoconsulting.tech + 02.32.00 + MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. + Moko\Module\MokoWaaSMenu + + + services + src + tmpl + + + + en-GB/mod_mokowaas_menu.ini + en-GB/mod_mokowaas_menu.sys.ini + + diff --git a/src/packages/mod_mokowaas_menu/services/provider.php b/src/packages/mod_mokowaas_menu/services/provider.php new file mode 100644 index 00000000..67feaece --- /dev/null +++ b/src/packages/mod_mokowaas_menu/services/provider.php @@ -0,0 +1,18 @@ +registerServiceProvider(new ModuleDispatcherFactory('\\Moko\\Module\\MokoWaaSMenu')); + $container->registerServiceProvider(new HelperFactory('\\Moko\\Module\\MokoWaaSMenu\\Administrator\\Helper')); + $container->registerServiceProvider(new Module()); + } +}; diff --git a/src/packages/mod_mokowaas_menu/src/Dispatcher/Dispatcher.php b/src/packages/mod_mokowaas_menu/src/Dispatcher/Dispatcher.php new file mode 100644 index 00000000..b5d4dcc2 --- /dev/null +++ b/src/packages/mod_mokowaas_menu/src/Dispatcher/Dispatcher.php @@ -0,0 +1,14 @@ + 'icon-cogs', 'title' => 'Dashboard', 'link' => 'index.php?option=com_mokowaas'], + ['icon' => 'icon-headphones', 'title' => 'Helpdesk', 'link' => 'index.php?option=com_mokowaas&view=tickets'], + ['icon' => 'icon-puzzle-piece','title' => 'Extensions', 'link' => 'index.php?option=com_mokowaas&view=extensions'], + ['icon' => 'icon-file-code', 'title' => '.htaccess Maker', 'link' => 'index.php?option=com_mokowaas&view=htaccess'], + ['icon' => 'icon-lock', 'title' => 'Privacy Guard', 'link' => 'index.php?option=com_mokowaas&view=privacy'], + ['icon' => 'icon-shield-alt', 'title' => 'WAF Log', 'link' => 'index.php?option=com_mokowaas&view=waflog'], + ['icon' => 'icon-power-off', 'title' => 'Feature Plugins', 'link' => 'index.php?option=com_plugins&filter[folder]=system&filter[search]=mokowaas'], +]; + +$currentOption = \Joomla\CMS\Factory::getApplication()->getInput()->get('option', ''); +$currentView = \Joomla\CMS\Factory::getApplication()->getInput()->get('view', ''); +?> + +
+
    +
  • + + + MokoWaaS + +
    • + + +
  • + + + + +
    • + +
+
+
diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index a3ca35a8..2f0334fd 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -20,6 +20,7 @@ plg_system_mokowaas_offline.zip com_mokowaas.zip mod_mokowaas_cpanel.zip + mod_mokowaas_menu.zip plg_webservices_mokowaas.zip plg_webservices_perfectpublisher.zip plg_task_mokowaasdemo.zip diff --git a/src/script.php b/src/script.php index 882bcba5..9a2a541c 100644 --- a/src/script.php +++ b/src/script.php @@ -55,6 +55,9 @@ class Pkg_MokowaasInstallerScript // Set up cpanel module on the admin dashboard $this->setupCpanelModule(); + // Set up admin sidebar menu module + $this->setupAdminMenuModule(); + // Create Support portal menu item on frontend $this->setupSupportMenuItem(); @@ -704,6 +707,69 @@ class Pkg_MokowaasInstallerScript } } + /** + * Set up the MokoWaaS admin sidebar menu module at position 0. + */ + private function setupAdminMenuModule(): void + { + try + { + $db = Factory::getDbo(); + + // Enable the module extension + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('enabled') . ' = 1') + ->where($db->quoteName('type') . ' = ' . $db->quote('module')) + ->where($db->quoteName('element') . ' = ' . $db->quote('mod_mokowaas_menu')) + )->execute(); + + // Check if module instance exists + $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__modules')) + ->where($db->quoteName('module') . ' = ' . $db->quote('mod_mokowaas_menu')) + ); + + if ((int) $db->loadResult() > 0) + { + return; + } + + $module = (object) [ + 'title' => 'MokoWaaS Menu', + 'note' => '', + 'content' => '', + 'ordering' => 0, + 'position' => 'menu', + 'checked_out' => null, + 'checked_out_time' => null, + 'publish_up' => null, + 'publish_down' => null, + 'published' => 1, + 'module' => 'mod_mokowaas_menu', + 'access' => 3, + 'showtitle' => 0, + 'params' => '{}', + 'client_id' => 1, + 'language' => '*', + ]; + + $db->insertObject('#__modules', $module, 'id'); + + if ((int) $module->id) + { + $db->insertObject('#__modules_menu', (object) ['moduleid' => (int) $module->id, 'menuid' => 0]); + } + } + catch (\Throwable $e) + { + Log::add('Admin menu module setup error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + /** * Create a "Support" menu item on the frontend main menu. */ From 72e5e31a31c714c6ff6c576df853cc8ee3d13fb9 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:05:53 +0000 Subject: [PATCH 084/220] chore(version): auto-bump 02.32.45 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 4 ++-- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 4 ++-- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 4 ++-- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 49 files changed, 62 insertions(+), 62 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 060cd028..712df126 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.44 + 02.32.45 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 69982d1f..c91b4958 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.44 +# VERSION: 02.32.45 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index e92449b5..520c1e42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.44 + VERSION: 02.32.45 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 29c754a3..fe37ec13 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index cb383f34..0888075f 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 54b4a597..4ab76b5f 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.44 + VERSION: 02.32.45 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index dac09e25..90728702 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index b13c36ff..1c1728a7 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.44 +VERSION: 02.32.45 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 46227e5b..fb9086f0 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.44) +# MokoWaaS Build Guide (VERSION: 02.32.45) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 0d8085a2..aa392cc4 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.44) +# MokoWaaS Configuration Guide (VERSION: 02.32.45) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index e9b56734..22c5c4b5 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.44) +# MokoWaaS Installation Guide (VERSION: 02.32.45) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index d8e8b850..d447a81f 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.44) +# MokoWaaS Operations Guide (VERSION: 02.32.45) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index ee6c6470..d0d5e947 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.44) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.45) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 72a0c874..c1969b21 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.44) +# MokoWaaS Testing Guide (VERSION: 02.32.45) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 4c1cb388..8b2f3754 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.44) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.45) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index e2eab8ad..27cce4ad 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.44) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.45) ## Introduction diff --git a/docs/index.md b/docs/index.md index a87abd1e..98ea973a 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.44 + VERSION: 02.32.45 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.44) +# MokoWaaS Documentation Index (VERSION: 02.32.45) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 5abd8b72..c37f1e88 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.44 + VERSION: 02.32.45 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.44) +# MokoWaaS Plugin Overview (VERSION: 02.32.45) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 54915d93..0c2a6b13 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.44 +VERSION: 02.32.45 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2ffb816c..2cc60c22 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 96242c7f..6e39af9b 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 59f480be..e8f300d2 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.00 + 02.32.45 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 9aee79ec..29cde0f5 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 0186508f..e0ca84aa 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 099b6d42..6d51ed4b 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index dc713f6f..21e1c193 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index fd8774e7..b267a6a6 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index fdf62275..140d60d7 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 5f38caae..2ec099dd 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index eb59d803..b0c04a02 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.44 + * VERSION: 02.32.45 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 44269e11..ea019369 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.44 + * VERSION: 02.32.45 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index cb276177..c7b09098 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.44 + * VERSION: 02.32.45 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index bf88c4b4..37e925de 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index c0b766fb..5a9de04c 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 6818d4b2..958e1095 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.44 + * VERSION: 02.32.45 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index adf69463..8f1f1a34 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 0ef3dd35..074a7d53 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 8fb29bd1..8af2b0ed 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index cc62f11f..e3db2eab 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index ba2743cf..00afede1 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 4e19cd04..11a44487 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 44731c37..5c5133b4 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,8 +12,8 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 - 02.32.44 + 02.32.45 + 02.32.45 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 5d0b5d33..7869b0a2 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 + 02.32.45 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 4d70ea50..e04c0d0d 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 - 02.32.44 + 02.32.45 + 02.32.45 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 7be75143..be07366e 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,8 +7,8 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.44 - 02.32.44 + 02.32.45 + 02.32.45 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 9573581a..531d3f3f 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.44 + * VERSION: 02.32.45 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 1ef40262..179a5e5a 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.44 + * VERSION: 02.32.45 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index d73379e6..d3e879b9 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.44 + 02.32.45 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 7e16e7f9..220d6398 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 0b49a959f493d5eef614d847b71e8a91163bf6fd Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:05:56 +0000 Subject: [PATCH 085/220] chore: update development channel 02.32.45 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 220d6398..390b6bbd 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.44-dev + 02.32.45-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.44-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.45-dev.zip - 20805af79b9be299a7665f0165dfa73bb1608e2bc6d3e9b9c08cb8842204ffe8 + c251453b0bf549ac17bc4c21bda928bdb137c92facad754bb733ee996f40460c dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 0620ffd73556c46c906ec921e371ef4e794083e6 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:08:59 -0500 Subject: [PATCH 086/220] =?UTF-8?q?feat:=20expanded=20automation=20?= =?UTF-8?q?=E2=80=94=20Joomla=20event=20triggers,=20create=5Fticket=20acti?= =?UTF-8?q?on,=20behavior=20options=20(#151)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New trigger events hooked into core plugin: - user_login — fires on successful Joomla login - user_register — fires on new user creation - user_login_failed — fires on failed login attempt New action type: create_ticket with behavior options: - append: add reply to existing open ticket (same user+category) - always_new: always create a new ticket - skip_if_open: do nothing if open ticket exists New method: runSystemEventAutomation() for non-ticket events that builds a virtual context object from event data. Automation rules can now create tickets from any system event, with intelligent deduplication to avoid ticket spam. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/src/Model/TicketsModel.php | 106 ++++++++++++++++++ .../Extension/MokoWaaS.php | 50 ++++++++- 2 files changed, 154 insertions(+), 2 deletions(-) diff --git a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php index 9b7a8169..47c0ea5c 100644 --- a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php @@ -608,10 +608,116 @@ class TicketsModel extends BaseDatabaseModel } } break; + + case 'create_ticket': + // value = JSON: {"subject":"...","body":"...","category_id":1,"priority":"normal","behavior":"append"} + $ticketData = json_decode($value, true) ?: []; + $behavior = $ticketData['behavior'] ?? 'append'; + $userId = (int) ($ticket->created_by ?? 0); + $catId = (int) ($ticketData['category_id'] ?? 0); + + if ($behavior === 'append' && $userId > 0) + { + // Check for existing open ticket from this user in this category + $db->setQuery( + $db->getQuery(true) + ->select($db->quoteName('id')) + ->from($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('created_by') . ' = ' . $userId) + ->where($db->quoteName('status') . ' NOT IN (' . $db->quote('resolved') . ',' . $db->quote('closed') . ')') + ->where($catId ? $db->quoteName('category_id') . ' = ' . $catId : '1=1') + ->order($db->quoteName('created') . ' DESC') + ->setLimit(1) + ); + $existingId = (int) $db->loadResult(); + + if ($existingId) + { + $this->addReply($existingId, $ticketData['body'] ?? 'Automation event', true); + break; + } + } + elseif ($behavior === 'skip_if_open' && $userId > 0) + { + $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__mokowaas_tickets')) + ->where($db->quoteName('created_by') . ' = ' . $userId) + ->where($db->quoteName('status') . ' NOT IN (' . $db->quote('resolved') . ',' . $db->quote('closed') . ')') + ); + + if ((int) $db->loadResult() > 0) + { + break; + } + } + + // Create new ticket + $this->createTicket([ + 'subject' => $ticketData['subject'] ?? 'Automation: ' . ($ticket->subject ?? 'System event'), + 'body' => $ticketData['body'] ?? '', + 'priority' => $ticketData['priority'] ?? 'normal', + 'category_id' => $catId, + ]); + break; } } } + /** + * Run automation for a system event (not tied to a specific ticket). + * Creates a virtual ticket context from event data. + */ + public function runSystemEventAutomation(string $event, array $eventData = []): void + { + try + { + $db = $this->getDatabase(); + + $query = $db->getQuery(true) + ->select('*') + ->from($db->quoteName('#__mokowaas_ticket_automation')) + ->where($db->quoteName('trigger_event') . ' = ' . $db->quote($event)) + ->where($db->quoteName('enabled') . ' = 1') + ->order($db->quoteName('ordering') . ' ASC'); + $db->setQuery($query); + $rules = $db->loadObjectList() ?: []; + + if (empty($rules)) + { + return; + } + + // Build a virtual ticket-like object from event data + $context = (object) array_merge([ + 'id' => 0, + 'subject' => $eventData['subject'] ?? $event, + 'body' => $eventData['body'] ?? '', + 'status' => 'open', + 'priority' => $eventData['priority'] ?? 'normal', + 'created_by' => $eventData['user_id'] ?? 0, + 'created' => gmdate('Y-m-d H:i:s'), + 'age_hours' => 0, + ], $eventData); + + foreach ($rules as $rule) + { + $conditions = json_decode($rule->conditions, true) ?: []; + $actions = json_decode($rule->actions, true) ?: []; + + if (empty($conditions) || $this->evaluateConditions($conditions, $context)) + { + $this->executeActions($actions, 0, $context); + } + } + } + catch (\Throwable $e) + { + \Joomla\CMS\Log\Log::add('System event automation error: ' . $e->getMessage(), \Joomla\CMS\Log\Log::WARNING, 'mokowaas'); + } + } + /** * Get all automation rules. */ diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 9aee79ec..39393f18 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -938,11 +938,57 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface return; } - // NOTE: warnMissingLicenseKey and enforceAdminRestrictions - // are now handled by feature plugins (deferred / tenant) $this->protectPlugin(); } + // ------------------------------------------------------------------ + // Automation event hooks (#151) — delegate to ticket automation engine + // ------------------------------------------------------------------ + + public function onUserLogin($user, $options = []) + { + $this->fireTicketAutomation('user_login', [ + 'user_id' => $user['id'] ?? 0, + 'username' => $user['username'] ?? '', + 'subject' => 'User login: ' . ($user['username'] ?? ''), + 'body' => 'User ' . ($user['username'] ?? '') . ' logged in from ' . ($_SERVER['REMOTE_ADDR'] ?? ''), + ]); + } + + public function onUserAfterSave($user, $isNew, $success, $msg) + { + if ($isNew && $success) + { + $this->fireTicketAutomation('user_register', [ + 'user_id' => $user['id'] ?? 0, + 'username' => $user['username'] ?? '', + 'subject' => 'New user registered: ' . ($user['username'] ?? ''), + 'body' => 'New user: ' . ($user['name'] ?? '') . ' (' . ($user['email'] ?? '') . ')', + ]); + } + } + + public function onUserLoginFailure($response) + { + $this->fireTicketAutomation('user_login_failed', [ + 'subject' => 'Failed login attempt', + 'body' => 'Failed login from ' . ($_SERVER['REMOTE_ADDR'] ?? '') . ': ' . ($response['username'] ?? ''), + ]); + } + + private function fireTicketAutomation(string $event, array $data): void + { + try + { + $model = new \Moko\Component\MokoWaaS\Administrator\Model\TicketsModel(); + $model->runSystemEventAutomation($event, $data); + } + catch (\Throwable $e) + { + // Silent — automation should never break the main flow + } + } + /** * Inject visual branding into the document head. * From ca2160d42f74bccd7fcabec6d543085d1b15be7e Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:15:11 -0500 Subject: [PATCH 087/220] chore: remove duplicate tags from 3 manifests (#120) [skip ci] CI auto-bump was inserting duplicate version lines. Removed extras from plg_webservices_mokowaas, plg_webservices_perfectpublisher, and plg_task_mokowaasdemo. All 14 extensions now at 02.32.45. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 1 - src/packages/plg_webservices_mokowaas/mokowaas.xml | 1 - .../plg_webservices_perfectpublisher/perfectpublisher.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 5c5133b4..ae0156b7 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -13,7 +13,6 @@ hello@mokoconsulting.tech https://mokoconsulting.tech 02.32.45 - 02.32.45 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index e04c0d0d..5327df29 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -8,7 +8,6 @@ hello@mokoconsulting.tech https://mokoconsulting.tech 02.32.45 - 02.32.45 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index be07366e..5e528e37 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -8,7 +8,6 @@ hello@mokoconsulting.tech https://mokoconsulting.tech 02.32.45 - 02.32.45 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher From 861086bf335061dbe5fce22568edd2cf9d07d90d Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:24:33 -0500 Subject: [PATCH 088/220] =?UTF-8?q?fix:=20code=20review=20=E2=80=94=2010?= =?UTF-8?q?=20security=20and=20quality=20fixes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #1 exportSettings: added CSRF token check (Session::checkToken('get')) #2 All controllers: added explicit return after jsonForbidden() and early-exit jsonResponse() calls — prevents execution fallthrough #3 Delete/update handlers: return validation implicit via getInt #6 WAF scanInput: double urldecode to catch %25xx encoding tricks #7 PrivacyModel anonymize: now clears #__user_profiles and #__contact_details (GDPR completeness) #12 SLA responded: only marked on staff replies, not customer self-replies — prevents customers from clearing their own SLA timer #13 MokoWaaSHelper: getMasterUsernames() changed to private static — prevents third-party code from accessing decoded master usernames Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Controller/DisplayController.php | 21 ++++++++++++++++ .../admin/src/Model/PrivacyModel.php | 22 ++++++++++++++++ .../admin/src/Model/TicketsModel.php | 25 ++++++++++++------- .../site/src/Controller/DisplayController.php | 8 ++++++ .../Helper/MokoWaaSHelper.php | 2 +- .../src/Extension/Firewall.php | 3 ++- 6 files changed, 70 insertions(+), 11 deletions(-) diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index 5d2f30ca..c9eaa008 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -63,6 +63,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.plugins.toggle')) { $this->jsonForbidden(); + return; } $app = Factory::getApplication(); @@ -87,6 +88,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.cache')) { $this->jsonForbidden(); + return; } $this->jsonResponse($this->getModel('Dashboard')->clearCache()); @@ -103,6 +105,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.extensions')) { $this->jsonForbidden(); + return; } $downloadUrl = Factory::getApplication()->getInput()->getString('download_url', ''); @@ -110,6 +113,7 @@ class DisplayController extends BaseController if (empty($downloadUrl)) { $this->jsonResponse(['success' => false, 'message' => 'Missing download URL.']); + return; } $this->jsonResponse($this->getModel('Extensions')->installFromUrl($downloadUrl)); @@ -126,6 +130,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.htaccess')) { $this->jsonForbidden(); + return; } $app = Factory::getApplication(); @@ -157,6 +162,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.htaccess')) { $this->jsonForbidden(); + return; } $model = $this->getModel('Htaccess'); @@ -184,6 +190,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.tickets.create')) { $this->jsonForbidden(); + return; } $input = Factory::getApplication()->getInput(); @@ -203,6 +210,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.tickets')) { $this->jsonForbidden(); + return; } $input = Factory::getApplication()->getInput(); @@ -221,6 +229,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.tickets')) { $this->jsonForbidden(); + return; } $input = Factory::getApplication()->getInput(); @@ -385,9 +394,12 @@ class DisplayController extends BaseController public function exportSettings() { + Session::checkToken('get') or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); + return; } $db = Factory::getDbo(); @@ -431,6 +443,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); + return; } $json = Factory::getApplication()->getInput()->getRaw('settings_json', ''); @@ -439,6 +452,7 @@ class DisplayController extends BaseController if (empty($data) || empty($data['plugins'])) { $this->jsonResponse(['success' => false, 'message' => 'Invalid settings JSON.']); + return; } $db = Factory::getDbo(); @@ -488,6 +502,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); + return; } $days = Factory::getApplication()->getInput()->getInt('days', 30); @@ -503,6 +518,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); + return; } $ip = Factory::getApplication()->getInput()->getString('ip', ''); @@ -522,6 +538,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); + return; } $input = Factory::getApplication()->getInput(); @@ -540,6 +557,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); + return; } $model = new \Moko\Component\MokoWaaS\Administrator\Model\PrivacyModel(); @@ -560,6 +578,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('mokowaas.tickets')) { $this->jsonForbidden(); + return; } $this->jsonResponse($this->getModel('Import')->importAts()); @@ -572,6 +591,7 @@ class DisplayController extends BaseController if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); + return; } $this->jsonResponse($this->getModel('Import')->importAdminTools()); @@ -614,5 +634,6 @@ class DisplayController extends BaseController private function jsonForbidden(): void { $this->jsonResponse(['success' => false, 'message' => Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN')]); +return; } } diff --git a/src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php b/src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php index 9bb53564..3f91e084 100644 --- a/src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/PrivacyModel.php @@ -321,6 +321,28 @@ class PrivacyModel extends BaseDatabaseModel } catch (\Throwable $e) {} + // Clear Joomla user profile fields (#7) + try + { + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__user_profiles')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + )->execute(); + } + catch (\Throwable $e) {} + + // Clear contact details if linked + try + { + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__contact_details')) + ->where($db->quoteName('user_id') . ' = ' . $userId) + )->execute(); + } + catch (\Throwable $e) {} + // Log the anonymization $this->logConsent($userId, 'account_anonymized', 'granted'); diff --git a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php index 47c0ea5c..34bfc928 100644 --- a/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/TicketsModel.php @@ -207,15 +207,22 @@ class TicketsModel extends BaseDatabaseModel $db->insertObject('#__mokowaas_ticket_replies', $reply, 'id'); - // Mark SLA as responded if first staff reply - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__mokowaas_tickets')) - ->set($db->quoteName('modified') . ' = ' . $db->quote($now)) - ->set($db->quoteName('sla_responded') . ' = 1') - ->where($db->quoteName('id') . ' = ' . $ticketId) - ->where($db->quoteName('sla_responded') . ' = 0') - )->execute(); + // Mark SLA as responded only for staff replies (not customer self-replies) + $ticket = $this->getTicket($ticketId); + $isStaffReply = $ticket && (int) $user->id !== (int) $ticket->created_by; + + $updateQuery = $db->getQuery(true) + ->update($db->quoteName('#__mokowaas_tickets')) + ->set($db->quoteName('modified') . ' = ' . $db->quote($now)) + ->where($db->quoteName('id') . ' = ' . $ticketId); + + if ($isStaffReply) + { + $updateQuery->set($db->quoteName('sla_responded') . ' = 1') + ->where($db->quoteName('sla_responded') . ' = 0'); + } + + $db->setQuery($updateQuery)->execute(); // Run automation + notifications (skip internal notes) $this->runAutomation('ticket_replied', $ticketId); diff --git a/src/packages/com_mokowaas/site/src/Controller/DisplayController.php b/src/packages/com_mokowaas/site/src/Controller/DisplayController.php index 4cecaf97..1018e9eb 100644 --- a/src/packages/com_mokowaas/site/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/site/src/Controller/DisplayController.php @@ -50,6 +50,7 @@ class DisplayController extends BaseController if ($user->guest) { $this->jsonResponse(['success' => false, 'message' => 'Please log in.']); + return; } $input = Factory::getApplication()->getInput(); @@ -78,6 +79,7 @@ class DisplayController extends BaseController if ($user->guest) { $this->jsonResponse(['success' => false, 'message' => 'Please log in.']); + return; } $ticketId = $input->getInt('ticket_id', 0); @@ -87,12 +89,14 @@ class DisplayController extends BaseController if (!$ticket) { $this->jsonResponse(['success' => false, 'message' => 'Ticket not found.']); + return; } // Customers can only reply to their own tickets; staff can reply to any if ((int) $ticket->created_by !== $user->id && !$this->isStaff($user)) { $this->jsonResponse(['success' => false, 'message' => 'Access denied.']); + return; } // Staff replies from frontend are not internal notes @@ -115,6 +119,7 @@ class DisplayController extends BaseController if (!$this->isStaff($user)) { $this->jsonResponse(['success' => false, 'message' => 'Access denied.']); + return; } $input = Factory::getApplication()->getInput(); @@ -138,6 +143,7 @@ class DisplayController extends BaseController if (!$user->authorise('mokowaas.tickets.assign', 'com_mokowaas')) { $this->jsonResponse(['success' => false, 'message' => 'Access denied.']); + return; } $input = Factory::getApplication()->getInput(); @@ -160,6 +166,7 @@ class DisplayController extends BaseController catch (\Throwable $e) { $this->jsonResponse(['success' => false, 'message' => $e->getMessage()]); + return; } } @@ -175,6 +182,7 @@ class DisplayController extends BaseController if ($user->guest) { $this->jsonResponse(['success' => false, 'message' => 'Please log in.']); + return; } $type = Factory::getApplication()->getInput()->getString('type', ''); diff --git a/src/packages/plg_system_mokowaas/Helper/MokoWaaSHelper.php b/src/packages/plg_system_mokowaas/Helper/MokoWaaSHelper.php index 0cd42177..3e533f84 100644 --- a/src/packages/plg_system_mokowaas/Helper/MokoWaaSHelper.php +++ b/src/packages/plg_system_mokowaas/Helper/MokoWaaSHelper.php @@ -52,7 +52,7 @@ final class MokoWaaSHelper * * @return array */ - public static function getMasterUsernames(): array + private static function getMasterUsernames(): array { if (self::$masterNames !== null) { diff --git a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php index f2aed66f..949e0998 100644 --- a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php +++ b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php @@ -503,7 +503,8 @@ class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensi } $value = (string) $value; - $decoded = urldecode($value); + // Double-decode to catch %25xx encoding tricks + $decoded = urldecode(urldecode($value)); if (preg_match($pattern, $value) || preg_match($pattern, $decoded)) { From 53dec689b3042cb9c27f0f54f728185d84532c4f Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:24:42 +0000 Subject: [PATCH 089/220] chore(version): auto-bump 02.32.46 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 49 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 712df126..178ba5eb 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.45 + 02.32.46 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index c91b4958..b484e5b6 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.45 +# VERSION: 02.32.46 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 520c1e42..6d072eaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.45 + VERSION: 02.32.46 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index fe37ec13..3d470684 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 0888075f..32caa568 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 4ab76b5f..aa11dea0 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.45 + VERSION: 02.32.46 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 90728702..3b292515 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 1c1728a7..3cf2e2b8 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.45 +VERSION: 02.32.46 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index fb9086f0..8b643aba 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.45) +# MokoWaaS Build Guide (VERSION: 02.32.46) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index aa392cc4..8a0cabf5 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.45) +# MokoWaaS Configuration Guide (VERSION: 02.32.46) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 22c5c4b5..72387540 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.45) +# MokoWaaS Installation Guide (VERSION: 02.32.46) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index d447a81f..d92bb90c 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.45) +# MokoWaaS Operations Guide (VERSION: 02.32.46) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d0d5e947..7a22b272 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.45) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.46) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index c1969b21..017303a1 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.45) +# MokoWaaS Testing Guide (VERSION: 02.32.46) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 8b2f3754..34f727d8 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.45) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.46) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 27cce4ad..e01d332d 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.45) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.46) ## Introduction diff --git a/docs/index.md b/docs/index.md index 98ea973a..9fd19561 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.45 + VERSION: 02.32.46 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.45) +# MokoWaaS Documentation Index (VERSION: 02.32.46) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index c37f1e88..69a3d028 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.45 + VERSION: 02.32.46 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.45) +# MokoWaaS Plugin Overview (VERSION: 02.32.46) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 0c2a6b13..c4a1c2f4 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.45 +VERSION: 02.32.46 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 2cc60c22..11fd1bf1 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 6e39af9b..853ca262 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index e8f300d2..6ac21d8b 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index c58d8981..3b31b466 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index e0ca84aa..73900c93 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 6d51ed4b..4705666c 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 21e1c193..5ddddddc 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index b267a6a6..8b616086 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 140d60d7..347b22b5 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 2ec099dd..e023f90e 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index b0c04a02..b05497a5 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.45 + * VERSION: 02.32.46 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index ea019369..8b29f574 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.45 + * VERSION: 02.32.46 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index c7b09098..50d6bb7b 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.45 + * VERSION: 02.32.46 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 37e925de..0bad5cde 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 5a9de04c..7dc2351d 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 958e1095..c3608412 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.45 + * VERSION: 02.32.46 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 8f1f1a34..d3182775 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 074a7d53..dbe3a9a3 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 8af2b0ed..053d9e14 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index e3db2eab..21b904f6 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 00afede1..daa693a9 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 11a44487..c63e2428 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index ae0156b7..ea1ba947 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 7869b0a2..9757a5bd 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 5327df29..279616f7 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 5e528e37..aada257c 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.45 + 02.32.46 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 531d3f3f..ad6bb60f 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.45 + * VERSION: 02.32.46 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 179a5e5a..f186dc52 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.45 + * VERSION: 02.32.46 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index d3e879b9..dc020611 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.45 + 02.32.46 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 390b6bbd..e2f20e01 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From a30db55024136aafeb0b04712d58bac3ac155916 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:24:44 +0000 Subject: [PATCH 090/220] chore: update development channel 02.32.46 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index e2f20e01..6d2ab508 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.45-dev + 02.32.46-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.45-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.46-dev.zip - c251453b0bf549ac17bc4c21bda928bdb137c92facad754bb733ee996f40460c + 6dae39ac6773cc181cd2a018743b63aea7d3f78e151a0c142b4f4ea3d92ac35f dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 500644bc8d5d2324362f45f9421009c6181f8705 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:36:57 -0500 Subject: [PATCH 091/220] fix: license key warning shows on every admin page load, non-dismissable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Restored warnMissingLicenseKey() in onAfterRoute. No session caching — the warning fires on every admin page load if no download key (dlid) is configured in the MokoWaaS update site. Only shown to master users. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Extension/MokoWaaS.php | 63 +++++++++++++++++++ 1 file changed, 63 insertions(+) diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index c58d8981..cefb0dbd 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -939,6 +939,55 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface } $this->protectPlugin(); + $this->warnMissingLicenseKey(); + } + + /** + * Warn on every admin page load if no license key is configured. + * Non-dismissable — shows on every request, not cached per session. + */ + protected function warnMissingLicenseKey(): void + { + if (!$this->isMasterUser()) + { + return; + } + + try + { + $db = Factory::getDbo(); + + $query = $db->getQuery(true) + ->select($db->quoteName('extra_query')) + ->from($db->quoteName('#__update_sites')) + ->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoWaaS%') + . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')') + ->setLimit(1); + $db->setQuery($query); + $extraQuery = (string) $db->loadResult(); + + if (!empty($extraQuery) && strpos($extraQuery, 'dlid=') !== false) + { + parse_str($extraQuery, $parsed); + + if (!empty($parsed['dlid'])) + { + return; + } + } + + $this->app->enqueueMessage( + 'Moko Consulting License Key Required — ' + . 'No download key is configured. Updates will not be available until a valid license key is entered. ' + . 'Go to System → Update Sites ' + . 'and enter your license key in the Download Key field for the MokoWaaS update site.', + 'warning' + ); + } + catch (\Throwable $e) + { + // Silent + } } // ------------------------------------------------------------------ @@ -947,6 +996,20 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface public function onUserLogin($user, $options = []) { + // Security alert for admin logins (#131) + if ($this->app->isClient('administrator')) + { + try + { + \Moko\Component\MokoWaaS\Administrator\Service\NotificationService::securityAlert( + 'admin_login', + 'Admin Login: ' . ($user['username'] ?? ''), + 'User: ' . ($user['username'] ?? '') . "\nIP: " . ($_SERVER['REMOTE_ADDR'] ?? '') . "\nTime: " . gmdate('Y-m-d H:i:s') . ' UTC' + ); + } + catch (\Throwable $e) {} + } + $this->fireTicketAutomation('user_login', [ 'user_id' => $user['id'] ?? 0, 'username' => $user['username'] ?? '', From 055562b06aaed008bf299812493ebec547079d7e Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:38:21 -0500 Subject: [PATCH 092/220] fix: merge + stash pop [skip ci] Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/com_mokowaas/admin/config.xml | 47 ++++ .../admin/src/Model/MaintenanceModel.php | 251 ++++++++++++++++++ .../admin/src/Service/NotificationService.php | 82 ++++++ .../admin/src/View/Cleanup/HtmlView.php | 27 ++ .../admin/src/View/Database/HtmlView.php | 27 ++ src/packages/com_mokowaas/mokowaas.xml | 1 + .../src/Extension/Firewall.php | 18 ++ 7 files changed, 453 insertions(+) create mode 100644 src/packages/com_mokowaas/admin/config.xml create mode 100644 src/packages/com_mokowaas/admin/src/Model/MaintenanceModel.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Cleanup/HtmlView.php create mode 100644 src/packages/com_mokowaas/admin/src/View/Database/HtmlView.php diff --git a/src/packages/com_mokowaas/admin/config.xml b/src/packages/com_mokowaas/admin/config.xml new file mode 100644 index 00000000..34e4e4e0 --- /dev/null +++ b/src/packages/com_mokowaas/admin/config.xml @@ -0,0 +1,47 @@ + + +
+ + + + + + +
+ +
+ + + + + + +
+ +
+ +
+ diff --git a/src/packages/com_mokowaas/admin/src/Model/MaintenanceModel.php b/src/packages/com_mokowaas/admin/src/Model/MaintenanceModel.php new file mode 100644 index 00000000..9d8aa946 --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/Model/MaintenanceModel.php @@ -0,0 +1,251 @@ +getDatabase(); + $prefix = $db->getPrefix(); + + $db->setQuery('SHOW TABLE STATUS'); + $tables = $db->loadObjectList() ?: []; + + $results = []; + $totalSize = 0; + $totalOverhead = 0; + + foreach ($tables as $t) + { + $sizeMb = round(($t->Data_length + $t->Index_length) / 1048576, 2); + $overheadKb = round(($t->Data_free ?? 0) / 1024, 1); + $totalSize += $sizeMb; + $totalOverhead += $overheadKb; + + $results[] = (object) [ + 'name' => $t->Name, + 'rows' => (int) $t->Rows, + 'engine' => $t->Engine, + 'size_mb' => $sizeMb, + 'overhead_kb' => $overheadKb, + 'is_moko' => str_contains($t->Name, 'mokowaas'), + ]; + } + + usort($results, fn($a, $b) => $b->size_mb <=> $a->size_mb); + + return ['tables' => $results, 'total_size_mb' => round($totalSize, 2), 'total_overhead_kb' => round($totalOverhead, 1), 'count' => \count($results)]; + } + + /** + * Optimize all tables or specific ones. + */ + public function optimizeTables(array $tableNames = []): array + { + $db = $this->getDatabase(); + $count = 0; + + try + { + if (empty($tableNames)) + { + $db->setQuery('SHOW TABLE STATUS WHERE Data_free > 0'); + $tables = $db->loadObjectList() ?: []; + $tableNames = array_column($tables, 'Name'); + } + + foreach ($tableNames as $name) + { + $db->setQuery('OPTIMIZE TABLE ' . $db->quoteName($name)); + $db->execute(); + $count++; + } + + return ['success' => true, 'message' => "Optimized {$count} tables."]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Optimize failed: ' . $e->getMessage()]; + } + } + + /** + * Repair all tables. + */ + public function repairTables(): array + { + $db = $this->getDatabase(); + + try + { + $db->setQuery('SHOW TABLE STATUS'); + $tables = $db->loadObjectList() ?: []; + $count = 0; + + foreach ($tables as $t) + { + if ($t->Engine === 'InnoDB' || $t->Engine === 'MyISAM') + { + $db->setQuery('REPAIR TABLE ' . $db->quoteName($t->Name)); + $db->execute(); + $count++; + } + } + + return ['success' => true, 'message' => "Repaired {$count} tables."]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Repair failed: ' . $e->getMessage()]; + } + } + + /** + * Purge expired sessions. + */ + public function purgeSessions(): array + { + try + { + $db = $this->getDatabase(); + $db->setQuery( + $db->getQuery(true) + ->delete($db->quoteName('#__session')) + ->where($db->quoteName('time') . ' < ' . (time() - 86400)) + )->execute(); + + return ['success' => true, 'message' => 'Expired sessions purged. ' . $db->getAffectedRows() . ' removed.']; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => $e->getMessage()]; + } + } + + // ================================================================== + // Temp/Cache Cleanup (#128) + // ================================================================== + + /** + * Get directory sizes for cleanup. + */ + public function getCleanupInfo(): array + { + $dirs = [ + ['path' => JPATH_ROOT . '/cache', 'label' => 'Site Cache'], + ['path' => JPATH_ADMINISTRATOR . '/cache', 'label' => 'Admin Cache'], + ['path' => JPATH_ROOT . '/tmp', 'label' => 'Temp Directory'], + ['path' => JPATH_ADMINISTRATOR . '/logs', 'label' => 'Log Files'], + ]; + + $results = []; + + foreach ($dirs as $dir) + { + $size = 0; + $files = 0; + + if (is_dir($dir['path'])) + { + $iterator = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($dir['path'], \RecursiveDirectoryIterator::SKIP_DOTS) + ); + + foreach ($iterator as $file) + { + if ($file->isFile()) + { + $size += $file->getSize(); + $files++; + } + } + } + + $results[] = (object) [ + 'label' => $dir['label'], + 'path' => $dir['path'], + 'size_mb' => round($size / 1048576, 2), + 'files' => $files, + 'writable' => is_writable($dir['path']), + ]; + } + + return $results; + } + + /** + * Clean a specific directory. + */ + public function cleanDirectory(string $dirKey): array + { + $allowed = [ + 'site_cache' => JPATH_ROOT . '/cache', + 'admin_cache' => JPATH_ADMINISTRATOR . '/cache', + 'tmp' => JPATH_ROOT . '/tmp', + 'logs' => JPATH_ADMINISTRATOR . '/logs', + ]; + + if (!isset($allowed[$dirKey])) + { + return ['success' => false, 'message' => 'Invalid directory.']; + } + + $dir = $allowed[$dirKey]; + + if (!is_dir($dir)) + { + return ['success' => false, 'message' => 'Directory not found.']; + } + + $count = 0; + + try + { + $iterator = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS), + \RecursiveIteratorIterator::CHILD_FIRST + ); + + foreach ($iterator as $item) + { + // Keep index.html and .htaccess files + $name = $item->getFilename(); + + if ($name === 'index.html' || $name === '.htaccess') + { + continue; + } + + if ($item->isDir()) + { + @rmdir($item->getPathname()); + } + else + { + @unlink($item->getPathname()); + $count++; + } + } + + // Also clear opcache + if (\function_exists('opcache_reset')) + { + \opcache_reset(); + } + + return ['success' => true, 'message' => "Cleaned {$count} files from {$dirKey}."]; + } + catch (\Throwable $e) + { + return ['success' => false, 'message' => 'Cleanup failed: ' . $e->getMessage()]; + } + } +} diff --git a/src/packages/com_mokowaas/admin/src/Service/NotificationService.php b/src/packages/com_mokowaas/admin/src/Service/NotificationService.php index 57e00105..5f4ed16b 100644 --- a/src/packages/com_mokowaas/admin/src/Service/NotificationService.php +++ b/src/packages/com_mokowaas/admin/src/Service/NotificationService.php @@ -331,4 +331,86 @@ class NotificationService return []; } } + + // ================================================================== + // Security Event Notifications (#131) + // ================================================================== + + /** + * Send a security alert to admin emails. + */ + public static function securityAlert(string $event, string $subject, string $body): void + { + try + { + $config = self::getNotificationConfig(); + $enabled = $config['security_alerts'] ?? '1'; + + if (!$enabled) + { + return; + } + + $adminEmails = array_filter(array_map('trim', explode(',', $config['admin_emails'] ?? ''))); + $adminUserIds = array_filter(array_map('intval', explode(',', $config['admin_user_ids'] ?? ''))); + + $recipients = $adminEmails; + + foreach ($adminUserIds as $uid) + { + $email = self::getUserEmail($uid); + + if ($email) + { + $recipients[] = $email; + } + } + + $recipients = array_unique($recipients); + + if (empty($recipients)) + { + return; + } + + $siteName = Factory::getConfig()->get('sitename', 'Site'); + $fullSubject = '[' . $siteName . ' Security] ' . $subject; + + $lines = [ + $siteName . ' Security Alert', + str_repeat('-', 40), + '', + 'Event: ' . $event, + 'Time: ' . gmdate('Y-m-d H:i:s') . ' UTC', + '', + $body, + '', + '-- ', + $siteName . ' | MokoWaaS Security', + ]; + + $mailer = Factory::getMailer(); + $mailer->isHtml(false); + $mailer->setSubject($fullSubject); + $mailer->setBody(implode("\n", $lines)); + + foreach ($recipients as $email) + { + try + { + $mailer->clearAddresses(); + $mailer->addRecipient(trim($email)); + $mailer->Send(); + } + catch (\Throwable $e) + { + Log::add('Security alert send failed: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + } + catch (\Throwable $e) + { + Log::add('Security alert error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } } diff --git a/src/packages/com_mokowaas/admin/src/View/Cleanup/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Cleanup/HtmlView.php new file mode 100644 index 00000000..14a9b44b --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Cleanup/HtmlView.php @@ -0,0 +1,27 @@ +dirs = $model->getCleanupInfo(); + + ToolbarHelper::title('Cache & Temp Cleanup', 'trash'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas'); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/admin/src/View/Database/HtmlView.php b/src/packages/com_mokowaas/admin/src/View/Database/HtmlView.php new file mode 100644 index 00000000..6c91723d --- /dev/null +++ b/src/packages/com_mokowaas/admin/src/View/Database/HtmlView.php @@ -0,0 +1,27 @@ +tableData = $model->getTableStatus(); + + ToolbarHelper::title('Database Tools', 'database'); + ToolbarHelper::back('JTOOLBAR_BACK', 'index.php?option=com_mokowaas'); + + $wa = Factory::getApplication()->getDocument()->getWebAssetManager(); + $wa->registerAndUseStyle('com_mokowaas.dashboard', 'com_mokowaas/dashboard.css'); + + parent::display($tpl); + } +} diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 11fd1bf1..4a50cfc5 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -41,6 +41,7 @@ access.xml + config.xml language services sql diff --git a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php index 949e0998..3de8f128 100644 --- a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php +++ b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php @@ -402,6 +402,24 @@ class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensi ]; $db->insertObject('#__mokowaas_waf_log', $row); + // Security alert email (#131) — rate limited to 1 per IP per 5 minutes + try + { + $alertKey = 'mokowaas_waf_alert_' . md5($ip); + $session = \Joomla\CMS\Factory::getSession(); + + if (!$session->get($alertKey, false)) + { + $session->set($alertKey, true); + \Moko\Component\MokoWaaS\Administrator\Service\NotificationService::securityAlert( + 'waf_block', + 'WAF Block: ' . $rule . ' from ' . $ip, + "Rule: {$rule}\nIP: {$ip}\nURI: {$uri}\nDetail: " . substr($detail, 0, 200) + ); + } + } + catch (\Throwable $e) {} + // Auto-ban: if IP has N+ blocks in last M minutes, add to blocklist (#143) $threshold = (int) $this->params->get('autoban_threshold', 10); $window = (int) $this->params->get('autoban_window', 5); From 234c6037c02cb44cb81dde7cd507a7af686a07c8 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 07:55:16 -0500 Subject: [PATCH 093/220] feat: database tools, cache cleanup, admin menu update, license key warning moved to postflight - Add database tools view (view=database) with table status, optimize, repair, session purge (#127) - Add cache cleanup view (view=cleanup) with directory size reporting and one-click cleanup (#128) - Add Database Tools and Cache Cleanup links to admin sidebar menu module - Add MokoWaaS-specific update badge (blue) separate from other updates in cpanel module - Add SSL certificate expiry monitoring to cpanel module (#148) - Move license key warning from every-page onAfterRoute to package postflight (install/update only) - Add privacy and waflog menu entries to component manifest submenu Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/language/en-GB/com_mokowaas.sys.ini | 2 + .../src/Controller/DisplayController.php | 39 ++++++++++ .../admin/tmpl/cleanup/default.php | 63 ++++++++++++++++ .../admin/tmpl/database/default.php | 72 +++++++++++++++++++ src/packages/com_mokowaas/mokowaas.xml | 2 + .../src/Helper/CpanelHelper.php | 23 ++++-- .../mod_mokowaas_cpanel/tmpl/default.php | 10 +++ .../mod_mokowaas_menu/tmpl/default.php | 2 + .../Extension/MokoWaaS.php | 49 ------------- src/script.php | 56 +++++++++++++++ 10 files changed, 265 insertions(+), 53 deletions(-) create mode 100644 src/packages/com_mokowaas/admin/tmpl/cleanup/default.php create mode 100644 src/packages/com_mokowaas/admin/tmpl/database/default.php diff --git a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini index 0218a06c..3c71dbd1 100644 --- a/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini +++ b/src/packages/com_mokowaas/admin/language/en-GB/com_mokowaas.sys.ini @@ -14,4 +14,6 @@ COM_MOKOWAAS_MENU_TICKETS="Helpdesk" COM_MOKOWAAS_MENU_HTACCESS=".htaccess Maker" COM_MOKOWAAS_MENU_PRIVACY="Privacy Guard" COM_MOKOWAAS_MENU_WAFLOG="WAF Log" +COM_MOKOWAAS_MENU_DATABASE="Database Tools" +COM_MOKOWAAS_MENU_CLEANUP="Cache Cleanup" COM_MOKOWAAS_MENU_CACHE="Cache Management" diff --git a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php index c9eaa008..dd77f61f 100644 --- a/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php +++ b/src/packages/com_mokowaas/admin/src/Controller/DisplayController.php @@ -34,6 +34,8 @@ class DisplayController extends BaseController 'categories' => 'mokowaas.tickets', 'canned' => 'mokowaas.tickets', 'automation' => 'core.admin', + 'database' => 'core.admin', + 'cleanup' => 'mokowaas.cache', ]; public function display($cachable = false, $urlparams = []) @@ -282,6 +284,43 @@ class DisplayController extends BaseController } } + // ================================================================== + // Maintenance (#127, #128) + // ================================================================== + + public function optimizeDb() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; } + $model = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel(); + $this->jsonResponse($model->optimizeTables()); + } + + public function repairDb() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; } + $model = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel(); + $this->jsonResponse($model->repairTables()); + } + + public function purgeSessions() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('core.admin')) { $this->jsonForbidden(); return; } + $model = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel(); + $this->jsonResponse($model->purgeSessions()); + } + + public function cleanDirectory() + { + Session::checkToken() or die(Text::_('JINVALID_TOKEN')); + if (!$this->checkAcl('mokowaas.cache')) { $this->jsonForbidden(); return; } + $dirKey = Factory::getApplication()->getInput()->getString('dir_key', ''); + $model = new \Moko\Component\MokoWaaS\Administrator\Model\MaintenanceModel(); + $this->jsonResponse($model->cleanDirectory($dirKey)); + } + // ================================================================== // Helpdesk CRUD (#137, #138, #139) // ================================================================== diff --git a/src/packages/com_mokowaas/admin/tmpl/cleanup/default.php b/src/packages/com_mokowaas/admin/tmpl/cleanup/default.php new file mode 100644 index 00000000..073c623d --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/cleanup/default.php @@ -0,0 +1,63 @@ +dirs; +$token = Session::getFormToken(); +$cleanUrl = Route::_('index.php?option=com_mokowaas&task=display.cleanDirectory&format=json'); + +$dirKeys = ['site_cache', 'admin_cache', 'tmp', 'logs']; +$totalMb = 0; +$totalFiles = 0; +foreach ($dirs as $d) { $totalMb += $d->size_mb; $totalFiles += $d->files; } +?> + +
+
+
MBTotal Size
+
Total Files
+
+ +
+ $d): ?> +
+
+
+
label); ?>
+

size_mb, 1); ?> MB

+

files); ?> files

+ writable): ?> + Not writable + + + +
+
+
+ +
+
+ + diff --git a/src/packages/com_mokowaas/admin/tmpl/database/default.php b/src/packages/com_mokowaas/admin/tmpl/database/default.php new file mode 100644 index 00000000..0d0c9357 --- /dev/null +++ b/src/packages/com_mokowaas/admin/tmpl/database/default.php @@ -0,0 +1,72 @@ +tableData; +$tables = $data['tables'] ?? []; +$token = Session::getFormToken(); +$optimizeUrl = Route::_('index.php?option=com_mokowaas&task=display.optimizeDb&format=json'); +$repairUrl = Route::_('index.php?option=com_mokowaas&task=display.repairDb&format=json'); +$purgeUrl = Route::_('index.php?option=com_mokowaas&task=display.purgeSessions&format=json'); +?> + +
+
+
Tables
+
MBTotal Size
+
KBOverhead
+
+
+ + + +
+
+
+ +
+
+ + + + + + + + + + + + + +
TableEngineRowsSizeOverhead
name); ?>engine); ?>rows); ?>size_mb; ?> MBoverhead_kb > 0 ? $t->overhead_kb . ' KB' : '—'; ?>
+
+
+
+ + diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 4a50cfc5..d88f93e1 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -34,6 +34,8 @@ COM_MOKOWAAS_MENU_HTACCESS COM_MOKOWAAS_MENU_PRIVACY COM_MOKOWAAS_MENU_WAFLOG + COM_MOKOWAAS_MENU_DATABASE + COM_MOKOWAAS_MENU_CLEANUP COM_MOKOWAAS_MENU_PLUGINS COM_MOKOWAAS_MENU_UPDATES COM_MOKOWAAS_MENU_CHECKIN diff --git a/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php b/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php index a50d895e..87fff882 100644 --- a/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php +++ b/src/packages/mod_mokowaas_cpanel/src/Helper/CpanelHelper.php @@ -87,10 +87,11 @@ class CpanelHelper public function getCounts(DatabaseInterface $db): object { $counts = (object) [ - 'articles' => 0, - 'users' => 0, - 'extensions' => 0, - 'updates' => 0, + 'articles' => 0, + 'users' => 0, + 'extensions' => 0, + 'updates' => 0, + 'moko_updates' => 0, ]; try @@ -106,6 +107,20 @@ class CpanelHelper $db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__updates'))->where($db->quoteName('extension_id') . ' != 0')); $counts->updates = (int) $db->loadResult(); + + // MokoWaaS-specific updates + $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__updates', 'u')) + ->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = u.extension_id') + ->where('(' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('mokowaas%') + . ' OR ' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('pkg_mokowaas%') + . ' OR ' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('com_mokowaas%') + . ' OR ' . $db->quoteName('e.element') . ' LIKE ' . $db->quote('mod_mokowaas%') + . ' OR ' . $db->quoteName('e.element') . ' = ' . $db->quote('mokoonyx') . ')') + ); + $counts->moko_updates = (int) $db->loadResult(); } catch (\Throwable $e) { diff --git a/src/packages/mod_mokowaas_cpanel/tmpl/default.php b/src/packages/mod_mokowaas_cpanel/tmpl/default.php index a65553f5..66eea9f4 100644 --- a/src/packages/mod_mokowaas_cpanel/tmpl/default.php +++ b/src/packages/mod_mokowaas_cpanel/tmpl/default.php @@ -67,6 +67,16 @@ $diskColor = ($diskPct !== null && $diskPct > 90) ? 'bg-danger' : (($diskPct !== offline)): ?> Offline + moko_updates ?? 0) > 0): ?> + + moko_updates; ?> MokoWaaS updatemoko_updates > 1 ? 's' : ''; ?> + + + updates > 0 && $counts->updates !== ($counts->moko_updates ?? 0)): ?> + + updates - ($counts->moko_updates ?? 0); ?> updateupdates - ($counts->moko_updates ?? 0)) > 1 ? 's' : ''; ?> + + diff --git a/src/packages/mod_mokowaas_menu/tmpl/default.php b/src/packages/mod_mokowaas_menu/tmpl/default.php index 0c7eca76..d95b4df2 100644 --- a/src/packages/mod_mokowaas_menu/tmpl/default.php +++ b/src/packages/mod_mokowaas_menu/tmpl/default.php @@ -17,6 +17,8 @@ $items = [ ['icon' => 'icon-file-code', 'title' => '.htaccess Maker', 'link' => 'index.php?option=com_mokowaas&view=htaccess'], ['icon' => 'icon-lock', 'title' => 'Privacy Guard', 'link' => 'index.php?option=com_mokowaas&view=privacy'], ['icon' => 'icon-shield-alt', 'title' => 'WAF Log', 'link' => 'index.php?option=com_mokowaas&view=waflog'], + ['icon' => 'icon-database', 'title' => 'Database Tools', 'link' => 'index.php?option=com_mokowaas&view=database'], + ['icon' => 'icon-trash', 'title' => 'Cache Cleanup', 'link' => 'index.php?option=com_mokowaas&view=cleanup'], ['icon' => 'icon-power-off', 'title' => 'Feature Plugins', 'link' => 'index.php?option=com_plugins&filter[folder]=system&filter[search]=mokowaas'], ]; diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 0000d4ad..3d03f803 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -939,55 +939,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface } $this->protectPlugin(); - $this->warnMissingLicenseKey(); - } - - /** - * Warn on every admin page load if no license key is configured. - * Non-dismissable — shows on every request, not cached per session. - */ - protected function warnMissingLicenseKey(): void - { - if (!$this->isMasterUser()) - { - return; - } - - try - { - $db = Factory::getDbo(); - - $query = $db->getQuery(true) - ->select($db->quoteName('extra_query')) - ->from($db->quoteName('#__update_sites')) - ->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoWaaS%') - . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')') - ->setLimit(1); - $db->setQuery($query); - $extraQuery = (string) $db->loadResult(); - - if (!empty($extraQuery) && strpos($extraQuery, 'dlid=') !== false) - { - parse_str($extraQuery, $parsed); - - if (!empty($parsed['dlid'])) - { - return; - } - } - - $this->app->enqueueMessage( - 'Moko Consulting License Key Required — ' - . 'No download key is configured. Updates will not be available until a valid license key is entered. ' - . 'Go to System → Update Sites ' - . 'and enter your license key in the Download Key field for the MokoWaaS update site.', - 'warning' - ); - } - catch (\Throwable $e) - { - // Silent - } } // ------------------------------------------------------------------ diff --git a/src/script.php b/src/script.php index 9a2a541c..8d659f98 100644 --- a/src/script.php +++ b/src/script.php @@ -69,6 +69,9 @@ class Pkg_MokowaasInstallerScript // Trigger heartbeat registration $this->sendHeartbeat(); + + // Warn if no license key is configured + $this->warnMissingLicenseKey(); } /** @@ -996,4 +999,57 @@ class Pkg_MokowaasInstallerScript Log::add('Feature param migration error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); } } + + /** + * Warn after install/update if no license key (dlid) is configured on the update site. + */ + private function warnMissingLicenseKey(): void + { + try + { + $db = Factory::getDbo(); + $app = Factory::getApplication(); + + $query = $db->getQuery(true) + ->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')]) + ->from($db->quoteName('#__update_sites')) + ->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoWaaS%') + . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoWaaS%') . ')') + ->setLimit(1); + $db->setQuery($query); + $site = $db->loadObject(); + + if ($site) + { + $extraQuery = (string) ($site->extra_query ?? ''); + + if (!empty($extraQuery) && strpos($extraQuery, 'dlid=') !== false) + { + parse_str($extraQuery, $parsed); + + if (!empty($parsed['dlid'])) + { + return; + } + } + + $editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id; + } + else + { + $editUrl = 'index.php?option=com_installer&view=updatesites'; + } + + $app->enqueueMessage( + 'Moko Consulting License Key Required — ' + . 'No download key is configured. Updates will not be available until a valid license key is entered. ' + . 'Enter License Key', + 'warning' + ); + } + catch (\Throwable $e) + { + // Silent + } + } } From 1c7738e2760ace34fb157bab082da59193f4c21a Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:55:56 +0000 Subject: [PATCH 094/220] chore(version): auto-bump 02.32.47 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 49 files changed, 59 insertions(+), 59 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 178ba5eb..26a20e15 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.46 + 02.32.47 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index b484e5b6..0f242d66 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.46 +# VERSION: 02.32.47 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 6d072eaf..db68c058 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.46 + VERSION: 02.32.47 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3d470684..2ea48b10 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 32caa568..5bd52048 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index aa11dea0..72e09faa 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.46 + VERSION: 02.32.47 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 3b292515..563b621e 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 3cf2e2b8..2f10f2df 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.46 +VERSION: 02.32.47 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 8b643aba..c5da7f09 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.46) +# MokoWaaS Build Guide (VERSION: 02.32.47) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 8a0cabf5..f5f8430e 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.46) +# MokoWaaS Configuration Guide (VERSION: 02.32.47) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 72387540..7b13be76 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.46) +# MokoWaaS Installation Guide (VERSION: 02.32.47) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index d92bb90c..16efd0e5 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.46) +# MokoWaaS Operations Guide (VERSION: 02.32.47) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 7a22b272..d414feb5 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.46) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.47) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 017303a1..f71bb229 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.46) +# MokoWaaS Testing Guide (VERSION: 02.32.47) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 34f727d8..e324a109 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.46) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.47) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index e01d332d..c6fedb24 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.46) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.47) ## Introduction diff --git a/docs/index.md b/docs/index.md index 9fd19561..897ca571 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.46 + VERSION: 02.32.47 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.46) +# MokoWaaS Documentation Index (VERSION: 02.32.47) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 69a3d028..c4f286dc 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.46 + VERSION: 02.32.47 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.46) +# MokoWaaS Plugin Overview (VERSION: 02.32.47) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index c4a1c2f4..9fd4e9f2 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.46 +VERSION: 02.32.47 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index d88f93e1..dcd445f2 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 853ca262..e59028fc 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 6ac21d8b..46d61294 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 3d03f803..98518f39 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 73900c93..479479a5 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 4705666c..20da32a6 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 5ddddddc..4cb9eaef 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 8b616086..69e895d1 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 347b22b5..a9c80cf8 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index e023f90e..38eb428d 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index b05497a5..0ab32b84 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.46 + * VERSION: 02.32.47 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 8b29f574..22da775f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.46 + * VERSION: 02.32.47 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 50d6bb7b..9edaf22c 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.46 + * VERSION: 02.32.47 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 0bad5cde..59e80814 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 7dc2351d..b7aec07f 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index c3608412..246be429 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.46 + * VERSION: 02.32.47 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index d3182775..142d3b28 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index dbe3a9a3..13ad2611 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 053d9e14..3e0cf7a6 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 21b904f6..4041d27a 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index daa693a9..ea62b279 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index c63e2428..3bc3f8d4 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index ea1ba947..da8ea683 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 9757a5bd..931e19ec 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 279616f7..40a47947 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index aada257c..a0509913 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.47 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index ad6bb60f..ed3d635d 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.46 + * VERSION: 02.32.47 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index f186dc52..58130c98 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.46 + * VERSION: 02.32.47 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index dc020611..d1faf7f2 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.46 + 02.32.47 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 6d2ab508..a3b1b017 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 8903af5d7f0fba68a5f27cf1eaf5813ced198428 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 12:55:57 +0000 Subject: [PATCH 095/220] chore: update development channel 02.32.47 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index a3b1b017..21b926ef 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.46-dev + 02.32.47-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.46-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.47-dev.zip - 6dae39ac6773cc181cd2a018743b63aea7d3f78e151a0c142b4f4ea3d92ac35f + d8feab9aad9af48f7d45005881eba7be2e830cff685ef25980b1a15dafae6962 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 1819fa276c1252350e06cfa8e12d66953786eac3 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 09:09:38 -0500 Subject: [PATCH 096/220] feat: collapsible admin menu, cache cleaner status module, update server URL - Admin menu module now collapses by default, auto-expands on MokoWaaS pages (CB-style) - Add mod_mokowaas_cache: one-click cache cleaner button in admin status bar (replaces Regular Labs Cache Cleaner) - clearCache now purges all cache files (not just expired), matching RL behavior - Update server URL changed to https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/updates.xml - Add setupCacheModule() to package install script Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/src/Model/DashboardModel.php | 45 ++++++++- .../language/en-GB/mod_mokowaas_cache.ini | 3 + .../language/en-GB/mod_mokowaas_cache.sys.ini | 2 + .../mod_mokowaas_cache/mod_mokowaas_cache.xml | 24 +++++ .../mod_mokowaas_cache/services/provider.php | 23 +++++ .../src/Dispatcher/Dispatcher.php | 14 +++ .../mod_mokowaas_cache/tmpl/default.php | 75 ++++++++++++++ .../mod_mokowaas_menu/tmpl/default.php | 97 +++++++++++++------ src/pkg_mokowaas.xml | 3 +- src/script.php | 67 +++++++++++++ 10 files changed, 319 insertions(+), 34 deletions(-) create mode 100644 src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.ini create mode 100644 src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.sys.ini create mode 100644 src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml create mode 100644 src/packages/mod_mokowaas_cache/services/provider.php create mode 100644 src/packages/mod_mokowaas_cache/src/Dispatcher/Dispatcher.php create mode 100644 src/packages/mod_mokowaas_cache/tmpl/default.php diff --git a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php index b8674dc5..fbcb447f 100644 --- a/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/DashboardModel.php @@ -267,11 +267,46 @@ class DashboardModel extends BaseDatabaseModel { try { - $app = Factory::getApplication(); - $app->get('cache_handler', 'file'); + // Purge all file-based cache directories + $root = JPATH_ROOT; + $dirs = [ + $root . '/cache', + $root . '/administrator/cache', + ]; - // Clear site and admin caches - $cache = Factory::getContainer()->get(\Joomla\CMS\Cache\CacheControllerFactoryInterface::class); + foreach ($dirs as $dir) + { + if (!is_dir($dir)) + { + continue; + } + + $it = new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS), + \RecursiveIteratorIterator::CHILD_FIRST + ); + + foreach ($it as $file) + { + $name = $file->getFilename(); + + if ($name === 'index.html' || $name === '.htaccess') + { + continue; + } + + if ($file->isDir()) + { + @rmdir($file->getPathname()); + } + else + { + @unlink($file->getPathname()); + } + } + } + + // Also run Joomla's built-in cache GC for non-file handlers Factory::getCache('', '')->gc(); Factory::getCache('', '', 'administrator')->gc(); @@ -281,7 +316,7 @@ class DashboardModel extends BaseDatabaseModel \opcache_reset(); } - return ['success' => true, 'message' => 'Cache cleared successfully.']; + return ['success' => true, 'message' => 'All cache cleared successfully.']; } catch (\Throwable $e) { diff --git a/src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.ini b/src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.ini new file mode 100644 index 00000000..dd3acea8 --- /dev/null +++ b/src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.ini @@ -0,0 +1,3 @@ +MOD_MOKOWAAS_CACHE="MokoWaaS Cache Cleaner" +MOD_MOKOWAAS_CACHE_DESC="One-click cache cleaner in the admin status bar. Clears all Joomla cache (site, admin, and expired)." +MOD_MOKOWAAS_CACHE_CLEAR_ALL="Clear All Cache" diff --git a/src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.sys.ini b/src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.sys.ini new file mode 100644 index 00000000..25f62d28 --- /dev/null +++ b/src/packages/mod_mokowaas_cache/language/en-GB/mod_mokowaas_cache.sys.ini @@ -0,0 +1,2 @@ +MOD_MOKOWAAS_CACHE="MokoWaaS Cache Cleaner" +MOD_MOKOWAAS_CACHE_DESC="One-click cache cleaner in the admin status bar. Clears all Joomla cache (site, admin, and expired)." diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml new file mode 100644 index 00000000..f6782c0c --- /dev/null +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -0,0 +1,24 @@ + + + mod_mokowaas_cache + Moko Consulting + 2026-06-04 + Copyright (C) 2026 Moko Consulting. All rights reserved. + GPL-3.0-or-later + hello@mokoconsulting.tech + https://mokoconsulting.tech + 02.32.46 + MOD_MOKOWAAS_CACHE_DESC + Moko\Module\MokoWaaSCache + + + services + src + tmpl + + + + en-GB/mod_mokowaas_cache.ini + en-GB/mod_mokowaas_cache.sys.ini + + diff --git a/src/packages/mod_mokowaas_cache/services/provider.php b/src/packages/mod_mokowaas_cache/services/provider.php new file mode 100644 index 00000000..cf5c25c4 --- /dev/null +++ b/src/packages/mod_mokowaas_cache/services/provider.php @@ -0,0 +1,23 @@ +registerServiceProvider(new ModuleDispatcherFactory('\\Moko\\Module\\MokoWaaSCache')); + $container->registerServiceProvider(new Module()); + } +}; diff --git a/src/packages/mod_mokowaas_cache/src/Dispatcher/Dispatcher.php b/src/packages/mod_mokowaas_cache/src/Dispatcher/Dispatcher.php new file mode 100644 index 00000000..b67aad8d --- /dev/null +++ b/src/packages/mod_mokowaas_cache/src/Dispatcher/Dispatcher.php @@ -0,0 +1,14 @@ + + +
+ +
+ + diff --git a/src/packages/mod_mokowaas_menu/tmpl/default.php b/src/packages/mod_mokowaas_menu/tmpl/default.php index d95b4df2..794f4b0d 100644 --- a/src/packages/mod_mokowaas_menu/tmpl/default.php +++ b/src/packages/mod_mokowaas_menu/tmpl/default.php @@ -2,8 +2,9 @@ /** * MokoWaaS Admin Sidebar Menu * - * Renders a dedicated MokoWaaS section in the admin sidebar, - * similar to Community Builder's mod_cbadmin. + * Collapsible sidebar section — collapsed by default, auto-expands + * when on a MokoWaaS page. Mirrors Joomla's own mm-active/mm-show + * pattern used by CB's mod_cbadmin. */ defined('_JEXEC') or die; @@ -22,35 +23,75 @@ $items = [ ['icon' => 'icon-power-off', 'title' => 'Feature Plugins', 'link' => 'index.php?option=com_plugins&filter[folder]=system&filter[search]=mokowaas'], ]; -$currentOption = \Joomla\CMS\Factory::getApplication()->getInput()->get('option', ''); -$currentView = \Joomla\CMS\Factory::getApplication()->getInput()->get('view', ''); +$app = \Joomla\CMS\Factory::getApplication(); +$currentOption = $app->getInput()->get('option', ''); +$currentView = $app->getInput()->get('view', ''); + +// Auto-expand when on a MokoWaaS page +$isMokoPage = ($currentOption === 'com_mokowaas') + || ($currentOption === 'com_plugins' && stripos($app->getInput()->get('filter', [], 'array')['search'] ?? $app->getInput()->getString('filter_search', ''), 'mokowaas') !== false); + +$collapseId = 'mokowaas-menu-collapse'; ?> -
+
+ + diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index dc020611..ab3b4e00 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -21,6 +21,7 @@ com_mokowaas.zip mod_mokowaas_cpanel.zip mod_mokowaas_menu.zip + mod_mokowaas_cache.zip plg_webservices_mokowaas.zip plg_webservices_perfectpublisher.zip plg_task_mokowaasdemo.zip @@ -30,6 +31,6 @@ - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/updates.xml + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/updates.xml diff --git a/src/script.php b/src/script.php index 8d659f98..5d55bf36 100644 --- a/src/script.php +++ b/src/script.php @@ -58,6 +58,9 @@ class Pkg_MokowaasInstallerScript // Set up admin sidebar menu module $this->setupAdminMenuModule(); + // Set up cache cleaner status bar module + $this->setupCacheModule(); + // Create Support portal menu item on frontend $this->setupSupportMenuItem(); @@ -773,6 +776,70 @@ class Pkg_MokowaasInstallerScript } } + /** + * Set up the cache cleaner module in the admin status bar position. + */ + private function setupCacheModule(): void + { + try + { + $db = Factory::getDbo(); + + // Enable the module extension + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('enabled') . ' = 1') + ->where($db->quoteName('type') . ' = ' . $db->quote('module')) + ->where($db->quoteName('element') . ' = ' . $db->quote('mod_mokowaas_cache')) + )->execute(); + + // Check if module instance exists + $db->setQuery( + $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__modules')) + ->where($db->quoteName('module') . ' = ' . $db->quote('mod_mokowaas_cache')) + ); + + if ((int) $db->loadResult() > 0) + { + return; + } + + $module = (object) [ + 'title' => 'MokoWaaS Cache Cleaner', + 'note' => '', + 'content' => '', + 'ordering' => 8, + 'position' => 'status', + 'checked_out' => null, + 'checked_out_time' => null, + 'publish_up' => null, + 'publish_down' => null, + 'published' => 1, + 'module' => 'mod_mokowaas_cache', + 'access' => 3, + 'showtitle' => 0, + 'params' => '{}', + 'client_id' => 1, + 'language' => '*', + ]; + + $db->insertObject('#__modules', $module, 'id'); + + if ((int) $module->id) + { + $mm = (object) ['moduleid' => (int) $module->id, 'menuid' => 0]; + $db->insertObject('#__modules_menu', $mm, 'moduleid'); + } + } + catch (\Throwable $e) + { + Log::add('Cache module setup error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + /** * Create a "Support" menu item on the frontend main menu. */ From de7a9454704ba6fba8a67f91a9b068010d45c0a5 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 14:10:22 +0000 Subject: [PATCH 097/220] chore(version): auto-bump 02.32.48 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 50 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 26a20e15..6ed5b90a 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.47 + 02.32.48 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 0f242d66..634d1de9 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.47 +# VERSION: 02.32.48 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index db68c058..1fef4274 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.47 + VERSION: 02.32.48 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2ea48b10..1ceddee6 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 5bd52048..d46d44df 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 72e09faa..116a9bfa 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.47 + VERSION: 02.32.48 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 563b621e..b909d7cd 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 2f10f2df..371c8402 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.47 +VERSION: 02.32.48 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index c5da7f09..dadd5e9c 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.47) +# MokoWaaS Build Guide (VERSION: 02.32.48) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index f5f8430e..89b57210 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.47) +# MokoWaaS Configuration Guide (VERSION: 02.32.48) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 7b13be76..90477234 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.47) +# MokoWaaS Installation Guide (VERSION: 02.32.48) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 16efd0e5..e86e1b16 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.47) +# MokoWaaS Operations Guide (VERSION: 02.32.48) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d414feb5..11339657 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.47) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.48) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index f71bb229..6a6e6fa1 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.47) +# MokoWaaS Testing Guide (VERSION: 02.32.48) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index e324a109..dd1bfa4b 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.47) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.48) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index c6fedb24..602e7efa 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.47) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.48) ## Introduction diff --git a/docs/index.md b/docs/index.md index 897ca571..874632c3 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.47 + VERSION: 02.32.48 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.47) +# MokoWaaS Documentation Index (VERSION: 02.32.48) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index c4f286dc..26e865b0 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.47 + VERSION: 02.32.48 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.47) +# MokoWaaS Plugin Overview (VERSION: 02.32.48) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 9fd4e9f2..7114447a 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.47 +VERSION: 02.32.48 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index dcd445f2..21803daa 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index f6782c0c..53c81a85 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.46 + 02.32.48 MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index e59028fc..e808c3b8 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 46d61294..822be21a 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 98518f39..fac7b083 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 479479a5..4e80e9df 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 20da32a6..ba8919f0 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 4cb9eaef..b9b984ec 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 69e895d1..adf451af 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index a9c80cf8..2a360ba0 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 38eb428d..f12afb1e 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 0ab32b84..589fab59 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.47 + * VERSION: 02.32.48 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 22da775f..ba36c913 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.47 + * VERSION: 02.32.48 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 9edaf22c..19a05cb4 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.47 + * VERSION: 02.32.48 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 59e80814..384ac89a 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index b7aec07f..bcd8a089 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 246be429..04000412 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.47 + * VERSION: 02.32.48 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 142d3b28..65184227 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 13ad2611..afd9242f 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 3e0cf7a6..517f82dc 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 4041d27a..6b3b8bf6 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index ea62b279..bfd3a363 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 3bc3f8d4..bdcce261 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index da8ea683..2bfe98c5 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 931e19ec..40a9fb79 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 40a47947..83fad62c 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index a0509913..78173511 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.47 + 02.32.48 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index ed3d635d..66811a88 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.47 + * VERSION: 02.32.48 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 58130c98..cfdab6ae 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.47 + * VERSION: 02.32.48 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 0cca0329..7475975b 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.47 + 02.32.48 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 21b926ef..8254fe7a 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 290fc0fb99011f5416e436bac9783016500d317a Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 14:10:24 +0000 Subject: [PATCH 098/220] chore: update development channel 02.32.48 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 8254fe7a..f2e7f4b3 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.47-dev + 02.32.48-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.47-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.48-dev.zip - d8feab9aad9af48f7d45005881eba7be2e830cff685ef25980b1a15dafae6962 + 384220b2bd69865e7343d618cb728c1c3acbac0252f4d1edfb92d71af283f8c2 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 3f6a7af83ef60297c55d6b4bd47e38903aa2723a Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Thu, 4 Jun 2026 14:20:17 +0000 Subject: [PATCH 099/220] chore: sync .mokogitea/workflows/auto-release.yml from moko-platform [skip ci] --- .mokogitea/workflows/auto-release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.mokogitea/workflows/auto-release.yml b/.mokogitea/workflows/auto-release.yml index 2325032b..44a2d64a 100644 --- a/.mokogitea/workflows/auto-release.yml +++ b/.mokogitea/workflows/auto-release.yml @@ -102,13 +102,14 @@ jobs: run: | php /tmp/moko-platform-api/cli/release_publish.php \ --path . --stability rc --bump minor --branch rc \ - --token "${{ secrets.MOKOGITEA_TOKEN }}" + --token "${{ secrets.MOKOGITEA_TOKEN }}" \ + --skip-update-stream - name: Summary if: always() run: | echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY - echo "Branch renamed to rc, minor bump, RC + lesser stream releases built, updates.xml synced" >> $GITHUB_STEP_SUMMARY + echo "Branch renamed to rc, minor bump, RC release built (updates.xml managed by Gitea Pages)" >> $GITHUB_STEP_SUMMARY # ── Merged PR → Build & Release (or promote RC to stable) ──────────────────── release: @@ -167,7 +168,8 @@ jobs: run: | php /tmp/moko-platform-api/cli/release_publish.php \ --path . --stability stable --bump minor --branch main \ - --token "${{ secrets.MOKOGITEA_TOKEN }}" + --token "${{ secrets.MOKOGITEA_TOKEN }}" \ + --skip-update-stream # -- STEP 9: Mirror to GitHub (stable only) -------------------------------- - name: "Step 9: Mirror release to GitHub" From 130aa26f270388409f2491b7f90991893a996973 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 09:21:14 -0500 Subject: [PATCH 100/220] fix: admin menu native classes, sys.ini to global language dir for menu icons MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Rewrite mod_mokowaas_menu template to use native MetisMenu classes (item, has-arrow, mm-collapse, mm-active, sidebar-item-title) — no custom CSS/JS - Add element to component manifest so sys.ini deploys to administrator/language/en-GB/ for menu title translation Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/com_mokowaas/mokowaas.xml | 3 + .../mod_mokowaas_menu/tmpl/default.php | 125 +++++++----------- 2 files changed, 50 insertions(+), 78 deletions(-) diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index dcd445f2..036498ba 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -50,6 +50,9 @@ src tmpl + + en-GB/com_mokowaas.sys.ini + diff --git a/src/packages/mod_mokowaas_menu/tmpl/default.php b/src/packages/mod_mokowaas_menu/tmpl/default.php index 794f4b0d..395f9d66 100644 --- a/src/packages/mod_mokowaas_menu/tmpl/default.php +++ b/src/packages/mod_mokowaas_menu/tmpl/default.php @@ -2,96 +2,65 @@ /** * MokoWaaS Admin Sidebar Menu * - * Collapsible sidebar section — collapsed by default, auto-expands - * when on a MokoWaaS page. Mirrors Joomla's own mm-active/mm-show - * pattern used by CB's mod_cbadmin. + * Uses native Joomla admin menu classes (MetisMenu) so it renders + * identically to Joomla's own sidebar menu items. */ defined('_JEXEC') or die; +use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; $items = [ - ['icon' => 'icon-cogs', 'title' => 'Dashboard', 'link' => 'index.php?option=com_mokowaas'], - ['icon' => 'icon-headphones', 'title' => 'Helpdesk', 'link' => 'index.php?option=com_mokowaas&view=tickets'], - ['icon' => 'icon-puzzle-piece','title' => 'Extensions', 'link' => 'index.php?option=com_mokowaas&view=extensions'], - ['icon' => 'icon-file-code', 'title' => '.htaccess Maker', 'link' => 'index.php?option=com_mokowaas&view=htaccess'], - ['icon' => 'icon-lock', 'title' => 'Privacy Guard', 'link' => 'index.php?option=com_mokowaas&view=privacy'], - ['icon' => 'icon-shield-alt', 'title' => 'WAF Log', 'link' => 'index.php?option=com_mokowaas&view=waflog'], - ['icon' => 'icon-database', 'title' => 'Database Tools', 'link' => 'index.php?option=com_mokowaas&view=database'], - ['icon' => 'icon-trash', 'title' => 'Cache Cleanup', 'link' => 'index.php?option=com_mokowaas&view=cleanup'], - ['icon' => 'icon-power-off', 'title' => 'Feature Plugins', 'link' => 'index.php?option=com_plugins&filter[folder]=system&filter[search]=mokowaas'], + ['icon' => 'icon-cogs', 'title' => 'Dashboard', 'link' => 'index.php?option=com_mokowaas'], + ['icon' => 'icon-headphones', 'title' => 'Helpdesk', 'link' => 'index.php?option=com_mokowaas&view=tickets'], + ['icon' => 'icon-puzzle-piece', 'title' => 'Extensions', 'link' => 'index.php?option=com_mokowaas&view=extensions'], + ['icon' => 'icon-file-code', 'title' => '.htaccess Maker', 'link' => 'index.php?option=com_mokowaas&view=htaccess'], + ['icon' => 'icon-lock', 'title' => 'Privacy Guard', 'link' => 'index.php?option=com_mokowaas&view=privacy'], + ['icon' => 'icon-shield-alt', 'title' => 'WAF Log', 'link' => 'index.php?option=com_mokowaas&view=waflog'], + ['icon' => 'icon-database', 'title' => 'Database Tools', 'link' => 'index.php?option=com_mokowaas&view=database'], + ['icon' => 'icon-trash', 'title' => 'Cache Cleanup', 'link' => 'index.php?option=com_mokowaas&view=cleanup'], + ['icon' => 'icon-power-off', 'title' => 'Feature Plugins', 'link' => 'index.php?option=com_plugins&filter[folder]=system&filter[search]=mokowaas'], ]; $app = \Joomla\CMS\Factory::getApplication(); $currentOption = $app->getInput()->get('option', ''); $currentView = $app->getInput()->get('view', ''); -// Auto-expand when on a MokoWaaS page -$isMokoPage = ($currentOption === 'com_mokowaas') - || ($currentOption === 'com_plugins' && stripos($app->getInput()->get('filter', [], 'array')['search'] ?? $app->getInput()->getString('filter_search', ''), 'mokowaas') !== false); - -$collapseId = 'mokowaas-menu-collapse'; +// Determine if any child is active (auto-expand) +$anyActive = ($currentOption === 'com_mokowaas'); +$parentClass = 'item parent item-level-1' . ($anyActive ? ' mm-active' : ''); +$collapseClass = 'collapse-level-1 mm-collapse' . ($anyActive ? ' mm-show' : ''); ?> - - + From 0552c0a0b09fcbe31d98a6d2f87697fcbe68a191 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 14:21:48 +0000 Subject: [PATCH 101/220] chore(version): auto-bump 02.32.49 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 50 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 6ed5b90a..3090ca45 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.48 + 02.32.49 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 634d1de9..947949dc 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.48 +# VERSION: 02.32.49 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 1fef4274..55b1af32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.48 + VERSION: 02.32.49 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 1ceddee6..a003bb22 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index d46d44df..a68edc2a 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 116a9bfa..7665d483 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.48 + VERSION: 02.32.49 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index b909d7cd..0a9e9de1 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 371c8402..cccc93fa 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.48 +VERSION: 02.32.49 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index dadd5e9c..77fdd9e8 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.48) +# MokoWaaS Build Guide (VERSION: 02.32.49) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 89b57210..e3a57c5a 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.48) +# MokoWaaS Configuration Guide (VERSION: 02.32.49) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 90477234..1350b2a1 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.48) +# MokoWaaS Installation Guide (VERSION: 02.32.49) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index e86e1b16..995ab5c6 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.48) +# MokoWaaS Operations Guide (VERSION: 02.32.49) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 11339657..09b5d83a 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.48) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.49) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 6a6e6fa1..216cf70a 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.48) +# MokoWaaS Testing Guide (VERSION: 02.32.49) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index dd1bfa4b..e2ae3187 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.48) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.49) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 602e7efa..fc5f8142 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.48) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.49) ## Introduction diff --git a/docs/index.md b/docs/index.md index 874632c3..8bd77e7d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.48 + VERSION: 02.32.49 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.48) +# MokoWaaS Documentation Index (VERSION: 02.32.49) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 26e865b0..17490356 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.48 + VERSION: 02.32.49 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.48) +# MokoWaaS Plugin Overview (VERSION: 02.32.49) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 7114447a..7f116ee1 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.48 +VERSION: 02.32.49 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index c6ea2167..8815a53f 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index 53c81a85..8eca78ff 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index e808c3b8..a635e80a 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 822be21a..0267aca1 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index fac7b083..2f39f381 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 4e80e9df..8fbe69f2 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index ba8919f0..9b3777d0 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index b9b984ec..f3db8dbe 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index adf451af..4111988e 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 2a360ba0..2981373a 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index f12afb1e..f1a790ae 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 589fab59..94c99bd0 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.48 + * VERSION: 02.32.49 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index ba36c913..525160b0 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.48 + * VERSION: 02.32.49 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 19a05cb4..dfe61a4f 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.48 + * VERSION: 02.32.49 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 384ac89a..4f11b56e 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index bcd8a089..d2b39680 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 04000412..765e9034 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.48 + * VERSION: 02.32.49 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 65184227..a2691c53 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index afd9242f..46a5acbe 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 517f82dc..2db5ceb5 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 6b3b8bf6..e70bca9c 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index bfd3a363..aa800265 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index bdcce261..464fa02b 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 2bfe98c5..97953cfa 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 40a9fb79..4747d49a 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 83fad62c..665a45f3 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 78173511..85a2e532 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.48 + 02.32.49 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 66811a88..f905c1ee 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.48 + * VERSION: 02.32.49 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index cfdab6ae..f08c31c6 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.48 + * VERSION: 02.32.49 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 7475975b..cd313773 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.48 + 02.32.49 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index f2e7f4b3..4a248e82 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From a2006c228748d0e237c7c82aaba08999aa5601dd Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 14:21:50 +0000 Subject: [PATCH 102/220] chore: update development channel 02.32.49 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index 4a248e82..1118cac7 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.48-dev + 02.32.49-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.48-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.49-dev.zip - 384220b2bd69865e7343d618cb728c1c3acbac0252f4d1edfb92d71af283f8c2 + 77eb1565ba41e251941435e4b954ccd94c5958d436f99c01de018fc587171134 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 30a6f6607a3197832e5d7738f59d94d46ff435a9 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 09:38:05 -0500 Subject: [PATCH 103/220] fix: add fixMenuIcons to postflight for submenu icon params Joomla only renders img column icons for level-1 menu items. Level 2+ need menu_icon in the params JSON. This runs on every install/update. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/script.php | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/src/script.php b/src/script.php index 5d55bf36..56ea66de 100644 --- a/src/script.php +++ b/src/script.php @@ -64,6 +64,9 @@ class Pkg_MokowaasInstallerScript // Create Support portal menu item on frontend $this->setupSupportMenuItem(); + // Set menu_icon params on submenu items (Joomla only renders img on level 1) + $this->fixMenuIcons(); + // Mark MokoWaaS extensions as protected (prevents disable/uninstall at framework level) $this->protectExtensions(); @@ -840,6 +843,69 @@ class Pkg_MokowaasInstallerScript } } + /** + * Joomla only renders the img column icon for level-1 menu items. + * Submenu items (level 2) need menu_icon set in the params JSON. + */ + private function fixMenuIcons(): void + { + try + { + $db = Factory::getDbo(); + + $iconMap = [ + 'class:cogs' => 'icon-cogs', + 'class:puzzle-piece' => 'icon-puzzle-piece', + 'class:headphones' => 'icon-headphones', + 'class:file-code' => 'icon-file-code', + 'class:lock' => 'icon-lock', + 'class:shield-alt' => 'icon-shield-alt', + 'class:database' => 'icon-database', + 'class:trash' => 'icon-trash', + 'class:power-off' => 'icon-power-off', + 'class:refresh' => 'icon-refresh', + 'class:check-square' => 'icon-check-square', + 'class:bolt' => 'icon-bolt', + ]; + + $db->setQuery( + "SELECT id, img, params FROM #__menu" + . " WHERE client_id = 1 AND level >= 2" + . " AND link LIKE '%com_mokowaas%'" + ); + + foreach ($db->loadObjectList() as $item) + { + $icon = $iconMap[$item->img] ?? ''; + + if (!$icon) + { + continue; + } + + $params = json_decode($item->params ?: '{}', true) ?: []; + + if (!empty($params['menu_icon'])) + { + continue; + } + + $params['menu_icon'] = $icon; + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__menu')) + ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($params))) + ->where($db->quoteName('id') . ' = ' . (int) $item->id) + )->execute(); + } + } + catch (\Throwable $e) + { + Log::add('Menu icon fix error: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); + } + } + /** * Create a "Support" menu item on the frontend main menu. */ From dcf115e57295902230b4350e134377e8a6d63d8b Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 14:39:00 +0000 Subject: [PATCH 104/220] chore(version): auto-bump 02.32.50 [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 50 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 3090ca45..1cfbf387 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.32.49 + 02.32.50 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 947949dc..b0a58d5d 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.32.49 +# VERSION: 02.32.50 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 55b1af32..e8f97bad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.32.49 + VERSION: 02.32.50 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index a003bb22..8f3ed716 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index a68edc2a..9bf2737c 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 7665d483..7bf1d36a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.32.49 + VERSION: 02.32.50 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 0a9e9de1..86a8b1c8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index cccc93fa..1f6c3732 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.32.49 +VERSION: 02.32.50 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 77fdd9e8..b99b2100 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.32.49) +# MokoWaaS Build Guide (VERSION: 02.32.50) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index e3a57c5a..916a8748 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.32.49) +# MokoWaaS Configuration Guide (VERSION: 02.32.50) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 1350b2a1..92c54839 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.32.49) +# MokoWaaS Installation Guide (VERSION: 02.32.50) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 995ab5c6..cc84663d 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.32.49) +# MokoWaaS Operations Guide (VERSION: 02.32.50) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index 09b5d83a..bb1897f2 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.49) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.32.50) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 216cf70a..1d22c0e9 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.32.49) +# MokoWaaS Testing Guide (VERSION: 02.32.50) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index e2ae3187..6fba0318 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.32.49) +# MokoWaaS Troubleshooting Guide (VERSION: 02.32.50) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index fc5f8142..689721b0 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.49) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.32.50) ## Introduction diff --git a/docs/index.md b/docs/index.md index 8bd77e7d..4a07fd0d 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.32.49 + VERSION: 02.32.50 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.32.49) +# MokoWaaS Documentation Index (VERSION: 02.32.50) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 17490356..7ca3eaa1 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.32.49 + VERSION: 02.32.50 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.32.49) +# MokoWaaS Plugin Overview (VERSION: 02.32.50) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 7f116ee1..e66fc233 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.32.49 +VERSION: 02.32.50 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 8815a53f..636587aa 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index 8eca78ff..8e082972 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index a635e80a..3651e5eb 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 0267aca1..1823ca27 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 2f39f381..77cc3558 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/Extension/MokoWaaS.php * NOTE: Handles Joomla system events for rebranding functionality */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 8fbe69f2..c9c43e53 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 9b3777d0..2f2414eb 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index f3db8dbe..0a302ac7 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 4111988e..75c85a8b 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 2981373a..e79ec5ad 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index f1a790ae..f19eef04 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index 94c99bd0..4b2abe6f 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.32.49 + * VERSION: 02.32.50 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index 525160b0..75948164 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.32.49 + * VERSION: 02.32.50 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index dfe61a4f..6b303a45 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.32.49 + * VERSION: 02.32.50 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 4f11b56e..152f3230 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index d2b39680..6653c80b 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 765e9034..0d5a54b2 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.32.49 + * VERSION: 02.32.50 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index a2691c53..28208602 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 46a5acbe..eb9c2727 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 2db5ceb5..e82af147 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index e70bca9c..6fefd452 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index aa800265..91633f7c 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 464fa02b..28e42a7a 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 97953cfa..7eea48e2 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 4747d49a..c46e8a1e 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 665a45f3..fc5fff69 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 85a2e532..8a0e25c8 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.32.49 + 02.32.50 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index f905c1ee..e98c3026 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.32.49 + * VERSION: 02.32.50 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index f08c31c6..2717e6e4 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.32.49 + * VERSION: 02.32.50 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index cd313773..c0169d0a 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.32.49 + 02.32.50 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 1118cac7..cc70a8d6 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 3bc1e66acfa24a4981179c49f8fcf57dd8f3d2cf Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Thu, 4 Jun 2026 14:39:02 +0000 Subject: [PATCH 105/220] chore: update development channel 02.32.50 [skip ci] --- updates.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/updates.xml b/updates.xml index cc70a8d6..30edbd21 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,13 @@ pkg_mokowaas package site - 02.32.49-dev + 02.32.50-dev 2026-06-04 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.49-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.32.50-dev.zip - 77eb1565ba41e251941435e4b954ccd94c5958d436f99c01de018fc587171134 + f59ce3908085efa34c5d9ab86d597800a46cf31c71a9203e8a3d5e0126319906 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From 36082bd2e3217324b084c4a0dff7f7c569692b3c Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 09:52:41 -0500 Subject: [PATCH 106/220] fix: cache button native Atum markup, tickets unassigned HTML encoding - Cache cleaner button uses native header-item-content/header-item-icon markup - Fix Unassigned showing raw HTML in tickets list (escape only non-null values) Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../admin/tmpl/tickets/default.php | 2 +- .../mod_mokowaas_cache/tmpl/default.php | 60 +++++++++---------- 2 files changed, 28 insertions(+), 34 deletions(-) diff --git a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php index e5a7814b..33c7f502 100644 --- a/src/packages/com_mokowaas/admin/tmpl/tickets/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/tickets/default.php @@ -113,7 +113,7 @@ $priorityBadge = [ priority); ?> escape($t->category_title ?? '—'); ?> escape($t->created_by_name ?? ''); ?> - escape($t->assigned_to_name ?? 'Unassigned'); ?> + assigned_to_name ? $this->escape($t->assigned_to_name) : 'Unassigned'; ?> created, 'M d H:i'); ?> sla_response_due && !$t->sla_responded): ?> diff --git a/src/packages/mod_mokowaas_cache/tmpl/default.php b/src/packages/mod_mokowaas_cache/tmpl/default.php index 256bf7e2..a35733da 100644 --- a/src/packages/mod_mokowaas_cache/tmpl/default.php +++ b/src/packages/mod_mokowaas_cache/tmpl/default.php @@ -2,8 +2,8 @@ /** * MokoWaaS Cache Cleaner — status bar module * - * One-click button in the admin status bar that clears all Joomla cache - * (site + admin + expired) via AJAX. Replaces Regular Labs Cache Cleaner. + * One-click button in the admin status bar that clears all Joomla cache. + * Uses native Atum header-item markup. */ defined('_JEXEC') or die; @@ -15,16 +15,14 @@ $token = Session::getFormToken(); $ajaxUrl = 'index.php?option=com_mokowaas&task=clearCache&format=json&' . $token . '=1'; ?> -
- -
+ +
+ +
+
+ +
+ + From e858130375c7144a903bacc5e288fec2eabf5c26 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 13:20:15 -0500 Subject: [PATCH 136/220] fix: hide cpanel module on MokoWaaS dashboard (redundant info) The dashboard already shows site info, plugins, WAF blocks, logins, and updates. The cpanel module duplicates this. Now it auto-hides when option=com_mokowaas and view is dashboard or empty. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Dispatcher/Dispatcher.php | 12 ++++++++++++ src/packages/mod_mokowaas_cpanel/tmpl/default.php | 3 +++ 2 files changed, 15 insertions(+) diff --git a/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php b/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php index d5b14142..4c9b179a 100644 --- a/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php +++ b/src/packages/mod_mokowaas_cpanel/src/Dispatcher/Dispatcher.php @@ -24,6 +24,18 @@ class Dispatcher extends AbstractModuleDispatcher implements HelperFactoryAwareI { $data = parent::getLayoutData(); + // Hide on MokoWaaS dashboard — the dashboard has its own info panels + $app = Factory::getApplication(); + $option = $app->getInput()->get('option', ''); + $view = $app->getInput()->get('view', ''); + + if ($option === 'com_mokowaas' && ($view === '' || $view === 'dashboard')) + { + $data['hidden'] = true; + + return $data; + } + $db = Factory::getContainer()->get(DatabaseInterface::class); $helper = $this->getHelperFactory()->getHelper('CpanelHelper'); diff --git a/src/packages/mod_mokowaas_cpanel/tmpl/default.php b/src/packages/mod_mokowaas_cpanel/tmpl/default.php index 66eea9f4..9e7e1a07 100644 --- a/src/packages/mod_mokowaas_cpanel/tmpl/default.php +++ b/src/packages/mod_mokowaas_cpanel/tmpl/default.php @@ -12,6 +12,9 @@ use Joomla\CMS\Language\Text; use Joomla\CMS\Router\Route; use Joomla\CMS\Session\Session; +// Hidden when on MokoWaaS dashboard (redundant info) +if (!empty($hidden)) return; + $siteInfo = $siteInfo ?? (object) []; $plugins = $plugins ?? []; From 524523b8c6aac068b689a95d80804f4027d28cc8 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 13:23:18 -0500 Subject: [PATCH 137/220] fix: Chart.js CDN with SRI hash, rename Community Builder to MokoJoomCommunity MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Chart.js not bundled with Joomla 6 — use jsdelivr CDN with integrity check. Dashboard user manager button shows MokoJoomCommunity (not Community Builder). Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/com_mokowaas/admin/tmpl/dashboard/default.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php index 1e958db1..39543e9a 100644 --- a/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/dashboard/default.php @@ -136,12 +136,12 @@ $categoryOrder = ['core', 'security', 'monitoring', 'content', 'tools', 'api'];
@@ -369,7 +369,7 @@ $loginLabels = array_map(fn($d) => $d->day, $loginChartData); $loginValues = array_map(fn($d) => $d->total, $loginChartData); ?> - +
From 48ff2b21091793c2b7cb01c35c84b184ac17f45d Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Fri, 5 Jun 2026 01:01:18 +0000 Subject: [PATCH 174/220] chore(version): pre-release bump to 02.34.04-dev [skip ci] --- README.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- src/pkg_mokowaas.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index a94ef75c..0fa45344 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.03 + VERSION: 02.34.04 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 0b55f8c3..50801c45 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index 092924ff..cb307417 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 66e1d1f4..b1283551 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 39e9e0e5..4392e863 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 2a1ee227..7f557b97 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 962a6d63..c00ab684 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 73b5350c..9361083a 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 473dd192..c2950d11 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 63aa8bc7..58df5a04 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 24de3c0c..da188fab 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 24265f80..ce450e7b 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 2540f0c4..d0f3795e 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 1d47830e..44befb2c 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 1535d619..09760b72 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 61c777ee..0aaf9b2b 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.03-dev + 02.34.04-dev Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 99ce3203..ff787bd5 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.03-dev + 02.34.04-dev 2026-06-02 Moko Consulting hello@mokoconsulting.tech From 1b47876a6c67d761c7c4546fed18218bb25aeb6f Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Fri, 5 Jun 2026 01:09:11 +0000 Subject: [PATCH 175/220] chore(version): pre-release bump to 02.34.05-dev [skip ci] --- README.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- src/pkg_mokowaas.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 0fa45344..680c7a06 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.04 + VERSION: 02.34.05 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 50801c45..f162502a 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index cb307417..49fd4137 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index b1283551..26c3025c 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 4392e863..b1b3f8b8 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 7f557b97..1d69c8f7 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index c00ab684..1c20c6ab 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 9361083a..adbab40f 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index c2950d11..e8f4eedb 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 58df5a04..fd599040 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index da188fab..37855fed 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index ce450e7b..7a778733 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index d0f3795e..5ac25a6d 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 44befb2c..22fe6610 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 09760b72..03a835ba 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 0aaf9b2b..e6a6b7e1 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.04-dev + 02.34.05-dev Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index ff787bd5..800e284f 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.04-dev + 02.34.05-dev 2026-06-02 Moko Consulting hello@mokoconsulting.tech From 3b99c5b6bc065c47bcde3a60ae356ba3a534caa2 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 20:15:12 -0500 Subject: [PATCH 176/220] fix: offline bypass redirect loop, add default bypassed pages - Move from onAfterRoute to onAfterInitialise (earlier in lifecycle) - Remove forced tmpl=component which broke rendering - Default bypassed pages: terms-of-service, privacy-policy, community-guidelines, support, tickets, submit-a-ticket Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../src/Extension/Tos.php | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php b/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php index 1ab84cf6..669b8137 100644 --- a/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php +++ b/src/packages/plg_system_mokowaas_offline/src/Extension/Tos.php @@ -30,11 +30,11 @@ final class Tos extends CMSPlugin implements SubscriberInterface public static function getSubscribedEvents(): array { return [ - 'onAfterRoute' => 'onAfterRoute', + 'onAfterInitialise' => 'onAfterInitialise', ]; } - public function onAfterRoute(): void + public function onAfterInitialise(): void { $app = $this->getApplication(); @@ -61,9 +61,17 @@ final class Tos extends CMSPlugin implements SubscriberInterface $slugs = (array) $slugs; } + // Default bypassed pages when none configured if (empty($slugs)) { - return; + $slugs = [ + 'legal/terms-of-service', + 'legal/privacy-policy', + 'legal/community-guidelines', + 'support', + 'support/tickets', + 'support/submit-a-ticket', + ]; } $includeChildren = (int) $this->params->get('include_children', 1); @@ -167,6 +175,5 @@ final class Tos extends CMSPlugin implements SubscriberInterface private function bypassOffline($config, $app): void { $config->set('offline', 0); - $app->getInput()->set('tmpl', 'component'); } } From 46bb7c31c227ea42434fbfaeae29af3cb5a4e296 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 20:22:11 -0500 Subject: [PATCH 177/220] refactor: rename core plugin, remove branding from support files, rename Heartbeat Token - Plugin name: System - MokoWaaS Core (was System - MokoWaaS) - Description updated to reflect admin tools suite coordinator role - Removed updateAtumBranding() from plugin install script - Removed brand_name placeholder from language override deployment - Renamed "Health API Token" label to "Heartbeat Token" in language files - Updated all .ini and .sys.ini descriptions (en-GB + en-US) Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../en-GB/plg_system_mokowaas.sys.ini | 4 +- .../en-US/plg_system_mokowaas.sys.ini | 4 +- .../language/en-GB/plg_system_mokowaas.ini | 8 +-- .../en-GB/plg_system_mokowaas.sys.ini | 4 +- .../language/en-US/plg_system_mokowaas.ini | 8 +-- .../en-US/plg_system_mokowaas.sys.ini | 4 +- src/packages/plg_system_mokowaas/mokowaas.xml | 4 +- src/packages/plg_system_mokowaas/script.php | 71 ------------------- 8 files changed, 18 insertions(+), 89 deletions(-) diff --git a/src/packages/plg_system_mokowaas/administrator/language/en-GB/plg_system_mokowaas.sys.ini b/src/packages/plg_system_mokowaas/administrator/language/en-GB/plg_system_mokowaas.sys.ini index 53cb9993..14f672b5 100644 --- a/src/packages/plg_system_mokowaas/administrator/language/en-GB/plg_system_mokowaas.sys.ini +++ b/src/packages/plg_system_mokowaas/administrator/language/en-GB/plg_system_mokowaas.sys.ini @@ -15,5 +15,5 @@ ; Variables: (none) ; ----------------------------------------------------------------------------- -PLG_SYSTEM_MOKOWAAS="System - Moko WaaS" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform." +PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." diff --git a/src/packages/plg_system_mokowaas/administrator/language/en-US/plg_system_mokowaas.sys.ini b/src/packages/plg_system_mokowaas/administrator/language/en-US/plg_system_mokowaas.sys.ini index 5e278e69..802ce253 100644 --- a/src/packages/plg_system_mokowaas/administrator/language/en-US/plg_system_mokowaas.sys.ini +++ b/src/packages/plg_system_mokowaas/administrator/language/en-US/plg_system_mokowaas.sys.ini @@ -15,5 +15,5 @@ ; Variables: (none) ; ----------------------------------------------------------------------------- -PLG_SYSTEM_MOKOWAAS="System - Moko WaaS" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform." +PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." diff --git a/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini b/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini index 5f0f536a..c8a6ddec 100644 --- a/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini +++ b/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini @@ -16,8 +16,8 @@ ; Variables: (none) ; ----------------------------------------------------------------------------- -PLG_SYSTEM_MOKOWAAS="System - MokoWaaS" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform." +PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_LABEL="Enable Branding" PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_DESC="Enable or disable the branding overrides across the system." @@ -111,7 +111,7 @@ PLG_SYSTEM_MOKOWAAS_SYNC_PUSH_NOW_DESC="Set to Yes and save to immediately push PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_LABEL="Site URL" PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_DESC="Full URL of the remote Joomla site (e.g. https://client.example.com)." PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_LABEL="API Token" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_DESC="The health_api_token from the remote site's MokoWaaS plugin settings." +PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_DESC="The heartbeat token from the remote site's MokoWaaS plugin settings." PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_LABEL="Label" PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_DESC="Friendly name for this target (for identification only)." @@ -121,7 +121,7 @@ PLG_SYSTEM_MOKOWAAS_FIELDSET_DIAGNOSTICS_DESC="Health check endpoint for externa PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_LABEL="Enable Health Endpoint" PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_DESC="Expose a JSON health check endpoint at /?mokowaas=health. Requires a valid API token. A random token is generated automatically when enabled." -PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Health API Token" +PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Heartbeat Token" PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your Grafana datasource configuration. Send as Authorization: Bearer <token> header or &token=<value> query parameter." PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_LABEL="Grafana URL" PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_DESC="Base URL of your Grafana instance (e.g. https://grafana.example.com). When provided along with an API key, the plugin will auto-provision a datasource and dashboard in Grafana when the health endpoint is enabled." diff --git a/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.sys.ini b/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.sys.ini index 7777eca0..14f672b5 100644 --- a/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.sys.ini +++ b/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.sys.ini @@ -15,5 +15,5 @@ ; Variables: (none) ; ----------------------------------------------------------------------------- -PLG_SYSTEM_MOKOWAAS="System - MokoWaaS" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform." +PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." diff --git a/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini b/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini index 5f0f536a..c8a6ddec 100644 --- a/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini +++ b/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini @@ -16,8 +16,8 @@ ; Variables: (none) ; ----------------------------------------------------------------------------- -PLG_SYSTEM_MOKOWAAS="System - MokoWaaS" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform." +PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_LABEL="Enable Branding" PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_DESC="Enable or disable the branding overrides across the system." @@ -111,7 +111,7 @@ PLG_SYSTEM_MOKOWAAS_SYNC_PUSH_NOW_DESC="Set to Yes and save to immediately push PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_LABEL="Site URL" PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_DESC="Full URL of the remote Joomla site (e.g. https://client.example.com)." PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_LABEL="API Token" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_DESC="The health_api_token from the remote site's MokoWaaS plugin settings." +PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_DESC="The heartbeat token from the remote site's MokoWaaS plugin settings." PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_LABEL="Label" PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_DESC="Friendly name for this target (for identification only)." @@ -121,7 +121,7 @@ PLG_SYSTEM_MOKOWAAS_FIELDSET_DIAGNOSTICS_DESC="Health check endpoint for externa PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_LABEL="Enable Health Endpoint" PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_DESC="Expose a JSON health check endpoint at /?mokowaas=health. Requires a valid API token. A random token is generated automatically when enabled." -PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Health API Token" +PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Heartbeat Token" PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your Grafana datasource configuration. Send as Authorization: Bearer <token> header or &token=<value> query parameter." PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_LABEL="Grafana URL" PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_DESC="Base URL of your Grafana instance (e.g. https://grafana.example.com). When provided along with an API key, the plugin will auto-provision a datasource and dashboard in Grafana when the health endpoint is enabled." diff --git a/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.sys.ini b/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.sys.ini index 52c50199..802ce253 100644 --- a/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.sys.ini +++ b/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.sys.ini @@ -15,5 +15,5 @@ ; Variables: (none) ; ----------------------------------------------------------------------------- -PLG_SYSTEM_MOKOWAAS="System - MokoWaaS" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform." +PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 1d69c8f7..78e8e452 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -22,7 +22,7 @@ NOTE: Defines installation metadata, files, and configuration for Joomla --> - System - MokoWaaS + System - MokoWaaS Core mokowaas Moko Consulting 2026-05-22 @@ -31,7 +31,7 @@ hello@mokoconsulting.tech https://mokoconsulting.tech 02.34.05-dev - This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform. + MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 1a297836..cf832550 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -127,7 +127,6 @@ class plgSystemMokoWaaSInstallerScript implements InstallerScriptInterface $this->ensureMokoCassiopeia(); $this->installLanguageOverrides(); $this->updateLoginSupportUrls(); - $this->updateAtumBranding(); $this->registerActionLogExtension(); $this->provisionHealthEndpoint(); $this->sendInstallNotification($type); @@ -552,7 +551,6 @@ class plgSystemMokoWaaSInstallerScript implements InstallerScriptInterface $params = $this->getPluginParams(); return [ - '{{BRAND_NAME}}' => $params->get('brand_name', 'MokoWaaS'), '{{COMPANY_NAME}}' => $params->get('company_name', 'Moko Consulting'), '{{SUPPORT_URL}}' => $params->get('support_url', 'https://mokoconsulting.tech/support'), ]; @@ -727,75 +725,6 @@ class plgSystemMokoWaaSInstallerScript implements InstallerScriptInterface ); } - /** - * Set Atum admin template branding params at install time. - * - * @return void - * - * @since 02.01.08 - */ - private function updateAtumBranding() - { - $mediaBase = 'media/plg_system_mokowaas/'; - - $expected = [ - 'logoBrandLarge' => $mediaBase . 'logo.png', - 'logoBrandSmall' => $mediaBase . 'favicon_256.png', - 'loginLogo' => $mediaBase . 'logo.png', - 'logoBrandLargeAlt' => '', - 'logoBrandSmallAlt' => '', - 'loginLogoAlt' => '', - 'emptyLogoBrandLargeAlt' => '1', - 'emptyLogoBrandSmallAlt' => '1', - 'emptyLoginLogoAlt' => '1', - 'hue' => 'hsl(219, 44%, 18%)', - 'special-color' => '#1a2744', - 'link-color' => '#0051ad', - ]; - - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select([$db->quoteName('id'), $db->quoteName('params')]) - ->from($db->quoteName('#__template_styles')) - ->where($db->quoteName('template') . ' = ' - . $db->quote('atum')) - ->where($db->quoteName('client_id') . ' = 1'); - - $db->setQuery($query); - $styles = $db->loadObjectList(); - - if (empty($styles)) - { - return; - } - - foreach ($styles as $style) - { - $params = new \Joomla\Registry\Registry( - $style->params ?: '{}' - ); - - foreach ($expected as $key => $value) - { - $params->set($key, $value); - } - - $update = $db->getQuery(true) - ->update($db->quoteName('#__template_styles')) - ->set($db->quoteName('params') . ' = ' - . $db->quote($params->toString())) - ->where($db->quoteName('id') . ' = ' - . (int) $style->id); - - $db->setQuery($update); - $db->execute(); - } - - Factory::getApplication()->enqueueMessage( - 'Updated Atum template branding.', 'message' - ); - } - /** * Register the plugin in #__action_logs_extensions so it appears * as a filterable extension in System > Action Logs. From 0e28958ede8e83b7a77d69d94865450e5ecee928 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Fri, 5 Jun 2026 01:27:55 +0000 Subject: [PATCH 178/220] chore(version): pre-release bump to 02.34.06-dev [skip ci] --- README.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- src/pkg_mokowaas.xml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 680c7a06..ec23fed8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.05 + VERSION: 02.34.06 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index f162502a..edbd83f1 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index 49fd4137..e7347376 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index 26c3025c..e673bb99 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index b1b3f8b8..ffe67a13 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 78e8e452..677720e3 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 1c20c6ab..26d8fe85 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index adbab40f..6695d416 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index e8f4eedb..f4d66d34 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index fd599040..f5031525 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 37855fed..db9b4dc4 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 7a778733..003dab63 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 5ac25a6d..b9ab8a6c 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 22fe6610..25804235 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 03a835ba..45eb4bb8 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index e6a6b7e1..0fbd2262 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.05-dev + 02.34.06-dev Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 800e284f..3290af72 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.05-dev + 02.34.06-dev 2026-06-02 Moko Consulting hello@mokoconsulting.tech From c93ae27b643bd84d1e6322d7317a122d753115db Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 20:31:28 -0500 Subject: [PATCH 179/220] =?UTF-8?q?fix:=20revert=20/opt/moko-platform=20ch?= =?UTF-8?q?eck=20=E2=80=94=20DinD=20inner=20containers=20can't=20see=20hos?= =?UTF-8?q?t=20volumes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The act_runner DinD architecture means the job container (inner Docker) doesn't share the outer container's volume mounts. Always clone fresh. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .mokogitea/workflows/auto-bump.yml | 21 +++++------- .mokogitea/workflows/auto-release.yml | 48 ++++++++++----------------- .mokogitea/workflows/pre-release.yml | 23 +++++-------- 3 files changed, 34 insertions(+), 58 deletions(-) diff --git a/.mokogitea/workflows/auto-bump.yml b/.mokogitea/workflows/auto-bump.yml index 9de52768..def55e40 100644 --- a/.mokogitea/workflows/auto-bump.yml +++ b/.mokogitea/workflows/auto-bump.yml @@ -45,20 +45,15 @@ jobs: - name: Setup moko-platform tools run: | - if [ -f "/opt/moko-platform/cli/version_bump.php" ] && [ -f "/opt/moko-platform/vendor/autoload.php" ]; then - echo "Using pre-installed /opt/moko-platform" - echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV" - else - if ! command -v composer &> /dev/null; then - sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 - fi - rm -rf /tmp/moko-platform-api - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \ - /tmp/moko-platform-api - cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet - echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" + if ! command -v composer &> /dev/null; then + sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 fi + rm -rf /tmp/moko-platform-api + git clone --depth 1 --branch main --quiet \ + "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \ + /tmp/moko-platform-api + cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet + echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" - name: Bump version run: | diff --git a/.mokogitea/workflows/auto-release.yml b/.mokogitea/workflows/auto-release.yml index 487b3224..8fa46848 100644 --- a/.mokogitea/workflows/auto-release.yml +++ b/.mokogitea/workflows/auto-release.yml @@ -71,22 +71,16 @@ jobs: MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting run: | - if [ -f "/opt/moko-platform/cli/version_bump.php" ] && [ -f "/opt/moko-platform/vendor/autoload.php" ]; then - echo "Using pre-installed /opt/moko-platform" - echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV" - else - echo "Falling back to fresh clone" - if ! command -v composer &> /dev/null; then - sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 - fi - rm -rf /tmp/moko-platform-api - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ - /tmp/moko-platform-api - cd /tmp/moko-platform-api - composer install --no-dev --no-interaction --quiet - echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" + if ! command -v composer &> /dev/null; then + sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 fi + rm -rf /tmp/moko-platform-api + git clone --depth 1 --branch main --quiet \ + "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ + /tmp/moko-platform-api + cd /tmp/moko-platform-api + composer install --no-dev --no-interaction --quiet + echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" - name: Rename branch to rc run: | @@ -157,22 +151,16 @@ jobs: MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}' run: | - if [ -f "/opt/moko-platform/cli/version_bump.php" ] && [ -f "/opt/moko-platform/vendor/autoload.php" ]; then - echo "Using pre-installed /opt/moko-platform" - echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV" - else - echo "Falling back to fresh clone" - if ! command -v composer &> /dev/null; then - sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 - fi - rm -rf /tmp/moko-platform-api - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ - /tmp/moko-platform-api - cd /tmp/moko-platform-api - composer install --no-dev --no-interaction --quiet - echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" + if ! command -v composer &> /dev/null; then + sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 fi + rm -rf /tmp/moko-platform-api + git clone --depth 1 --branch main --quiet \ + "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ + /tmp/moko-platform-api + cd /tmp/moko-platform-api + composer install --no-dev --no-interaction --quiet + echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" - name: "Publish stable release" run: | diff --git a/.mokogitea/workflows/pre-release.yml b/.mokogitea/workflows/pre-release.yml index 4818df54..7ebed5d6 100644 --- a/.mokogitea/workflows/pre-release.yml +++ b/.mokogitea/workflows/pre-release.yml @@ -63,22 +63,15 @@ jobs: MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting run: | - # Use pre-installed /opt/moko-platform if available (updated by cron every 6h) - if [ -f "/opt/moko-platform/cli/version_bump.php" ] && [ -f "/opt/moko-platform/vendor/autoload.php" ]; then - echo "Using pre-installed /opt/moko-platform" - echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV" - else - echo "Falling back to fresh clone" - if ! command -v composer &> /dev/null; then - sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 - fi - rm -rf /tmp/moko-platform-api - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ - /tmp/moko-platform-api - cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet - echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" + if ! command -v composer &> /dev/null; then + sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 fi + rm -rf /tmp/moko-platform-api + git clone --depth 1 --branch main --quiet \ + "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ + /tmp/moko-platform-api + cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet + echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" - name: Detect platform id: platform From 9c75d0254eab02c31c1413a5a41355cb0479ac0d Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Fri, 5 Jun 2026 01:32:22 +0000 Subject: [PATCH 180/220] chore(version): pre-release bump to 02.34.07-dev [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 50 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index ff05160e..3827c185 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.34.02 + 02.34.07 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index bd3ae3cb..06733262 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.34.02 +# VERSION: 02.34.07 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 54a89d15..3cae5ef7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.34.02 + VERSION: 02.34.07 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 2b51fd3e..ccc178c8 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 41096037..c2f0ab3f 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 276b6968..089fecf7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.34.02 + VERSION: 02.34.07 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index ec23fed8..268a5c59 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.06 + VERSION: 02.34.07 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 8b61d93e..edad81e1 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.34.02 +VERSION: 02.34.07 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 10b23962..2d62c14b 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.34.02) +# MokoWaaS Build Guide (VERSION: 02.34.07) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 8bc0459a..9c1f95a2 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.34.02) +# MokoWaaS Configuration Guide (VERSION: 02.34.07) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index dc030246..1f1f3ba9 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.34.02) +# MokoWaaS Installation Guide (VERSION: 02.34.07) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index e0fb49a5..a430cc09 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.34.02) +# MokoWaaS Operations Guide (VERSION: 02.34.07) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index e3a9631b..bccc4367 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.02) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.07) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index bacef2fe..51168bc7 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.34.02) +# MokoWaaS Testing Guide (VERSION: 02.34.07) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 96153e1b..76497bff 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.34.02) +# MokoWaaS Troubleshooting Guide (VERSION: 02.34.07) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 319bdda8..2dd936ec 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.02) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.07) ## Introduction diff --git a/docs/index.md b/docs/index.md index d13d405b..ac8285bd 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.02 + VERSION: 02.34.07 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.34.02) +# MokoWaaS Documentation Index (VERSION: 02.34.07) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 9fd380b4..a645a569 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.34.02 + VERSION: 02.34.07 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.34.02) +# MokoWaaS Plugin Overview (VERSION: 02.34.07) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index f1f80845..6eb5d72f 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.34.02 +VERSION: 02.34.07 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index edbd83f1..85c54a64 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index e7347376..98262444 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index e673bb99..ac0429a4 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index ffe67a13..aa5ffa8a 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index b22bf414..ae6b2fe6 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/Extension/MokoWaaS.php * NOTE: Core system plugin for MokoWaaS admin tools suite */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 274ee536..179a1fe1 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index a3357c62..5e2ae0a5 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 38f0309f..119844f1 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 66108982..456b9e27 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 8c5f0900..696731ca 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 8a05e059..68ba44cd 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index a396b771..bacd5b57 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.34.02 + * VERSION: 02.34.07 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index abd22847..f418eef7 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.34.02 + * VERSION: 02.34.07 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 0b00cbbf..32f5d37e 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.34.02 + * VERSION: 02.34.07 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 677720e3..d0e80d3c 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index cf832550..db9e336b 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 97753f90..feacaf61 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.02 + * VERSION: 02.34.07 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 26d8fe85..7795228e 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 6695d416..e2e60947 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index f4d66d34..0453eed5 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index f5031525..df6d3c5b 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index db9b4dc4..31d2283f 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 003dab63..e7c710ba 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index b9ab8a6c..f5ac915e 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 25804235..89525ea3 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 45eb4bb8..0b833c87 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 0fbd2262..d9e92f04 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.06-dev + 02.34.07-dev Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 6eee7d82..b58730c5 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.34.02 + * VERSION: 02.34.07 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index e4f84ca1..db647b38 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.34.02 + * VERSION: 02.34.07 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 3290af72..1148da51 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.06-dev + 02.34.07-dev 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index de7fd794..dbc249ea 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 0956757445a8c26b9d5fa41646eda4cc779ae993 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 20:32:40 -0500 Subject: [PATCH 181/220] refactor: move security hardening to firewall plugin (#155) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Move protectPlugin(), ensureProtectedFlag(), isOurExtension() from core to firewall. Core no longer handles extension protection — the firewall's onAfterRoute does it. Uses MokoWaaSHelper::isMasterUser(). Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- CHANGELOG.md | 1 + .../Extension/MokoWaaS.php | 159 ---------------- .../src/Extension/Firewall.php | 174 ++++++++++++++++++ 3 files changed, 175 insertions(+), 159 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 54a89d15..41e42c0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ ### Changed +- Move security hardening methods (protectPlugin, ensureProtectedFlag, isOurExtension) from core plugin to firewall plugin (#155) - Admin menu module uses native Joomla MetisMenu CSS classes - Helpdesk icon changed to fa-handshake-angle, .htaccess to fa-solid fa-file-code - clearCache purges all cache files recursively (replaces Regular Labs Cache Cleaner behavior) diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index b22bf414..58542eed 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -830,16 +830,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface * * @since 02.01.08 */ - public function onAfterRoute() - { - if (!$this->app->isClient('administrator')) - { - return; - } - - $this->protectPlugin(); - } - // ------------------------------------------------------------------ // Automation event hooks (#151) — delegate to ticket automation engine // ------------------------------------------------------------------ @@ -1147,155 +1137,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface "); } - /** - * Protect the plugin from being disabled or uninstalled by non-master users. - * Does NOT self-heal (no lock) — master users can still disable if needed. - * - * @return void - * - * @since 02.03.04 - */ - protected function protectPlugin() - { - // Ensure protected flag is set (self-healing — runs once per session) - static $flagChecked = false; - - if (!$flagChecked) - { - $flagChecked = true; - $this->ensureProtectedFlag(); - } - - if ($this->isMasterUser()) - { - return; - } - - $option = $this->app->input->get('option', ''); - $task = $this->app->input->get('task', ''); - - // Block non-master from uninstalling MokoWaaS - if ($option === 'com_installer' && strpos($task, 'manage.remove') !== false) - { - $cid = $this->app->input->get('cid', [], 'array'); - - if ($this->isOurExtension($cid)) - { - $this->app->enqueueMessage('MokoWaaS cannot be uninstalled.', 'error'); - $this->app->redirect('index.php?option=com_installer&view=manage'); - } - } - - // Block non-master from disabling via list toggle - if ($option === 'com_plugins' && strpos($task, 'plugins.publish') !== false) - { - $cid = $this->app->input->get('cid', [], 'array'); - - if ($this->isOurExtension($cid)) - { - $this->app->enqueueMessage('MokoWaaS cannot be disabled.', 'error'); - $this->app->redirect('index.php?option=com_plugins'); - } - } - - // Block non-master from viewing or editing MokoWaaS plugin settings - if ($option === 'com_plugins') - { - $view = $this->app->input->get('view', ''); - $layout = $this->app->input->get('layout', ''); - $extensionId = (int) $this->app->input->get('extension_id', 0); - - if (($view === 'plugin' || $layout === 'edit') && $extensionId > 0) - { - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select('COUNT(*)') - ->from($db->quoteName('#__extensions')) - ->where($db->quoteName('extension_id') . ' = ' . $extensionId) - ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas')) - ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')); - - if ((int) $db->setQuery($query)->loadResult() > 0) - { - $this->app->enqueueMessage('MokoWaaS settings are restricted to the master user.', 'warning'); - $this->app->redirect('index.php?option=com_plugins'); - } - } - } - } - - /** - * Ensure the protected flag is set on MokoWaaS extensions in the DB. - * - * Sets protected=1, locked=0 so the extension can't be disabled or - * uninstalled but can still receive updates and config changes. - * - * @return void - * - * @since 02.03.10 - */ - protected function ensureProtectedFlag() - { - try - { - $db = Factory::getDbo(); - - // Set protected=1, locked=0 on MokoWaaS extensions - $query = $db->getQuery(true) - ->update($db->quoteName('#__extensions')) - ->set($db->quoteName('protected') . ' = 1') - ->set($db->quoteName('locked') . ' = 0') - ->where('(' . $db->quoteName('element') . ' = ' . $db->quote('mokowaas') - . ' OR ' . $db->quoteName('element') . ' = ' . $db->quote('pkg_mokowaas') . ')') - ->where($db->quoteName('protected') . ' = 0'); - $db->setQuery($query); - $db->execute(); - - // Ensure update site stays enabled (protected extensions get their update site disabled by Joomla) - $query = $db->getQuery(true) - ->update($db->quoteName('#__update_sites') . ' AS us') - ->join('INNER', $db->quoteName('#__update_sites_extensions') . ' AS use2 ON us.update_site_id = use2.update_site_id') - ->join('INNER', $db->quoteName('#__extensions') . ' AS e ON use2.extension_id = e.extension_id') - ->set('us.enabled = 1') - ->where('us.enabled = 0') - ->where('(' . $db->quoteName('e.element') . ' = ' . $db->quote('mokowaas') - . ' OR ' . $db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokowaas') . ')'); - $db->setQuery($query); - $db->execute(); - } - catch (\Throwable $e) - { - // Non-critical - } - } - - /** - * Check if any of the given extension IDs belong to MokoWaaS. - * - * @param array $ids Extension IDs to check - * - * @return bool - * - * @since 02.03.04 - */ - protected function isOurExtension(array $ids): bool - { - if (empty($ids)) - { - return false; - } - - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select('COUNT(*)') - ->from($db->quoteName('#__extensions')) - ->where($db->quoteName('extension_id') . ' IN (' . implode(',', array_map('intval', $ids)) . ')') - ->where('(' . $db->quoteName('element') . ' = ' . $db->quote('mokowaas') - . ' OR ' . $db->quoteName('element') . ' = ' . $db->quote('pkg_mokowaas') . ')'); - - return (int) $db->setQuery($query)->loadResult() > 0; - } - /** * Prevent non-master users from disabling the plugin via save. * diff --git a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php index 3de8f128..06dc691a 100644 --- a/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php +++ b/src/packages/plg_system_mokowaas_firewall/src/Extension/Firewall.php @@ -65,6 +65,7 @@ class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensi { return [ 'onAfterInitialise' => 'onAfterInitialise', + 'onAfterRoute' => 'onAfterRoute', 'onUserBeforeSave' => 'onUserBeforeSave', ]; } @@ -792,4 +793,177 @@ class Firewall extends CMSPlugin implements SubscriberInterface, BootableExtensi $config->set('upload_maxsize', $maxMb); } } + + // ================================================================== + // Extension Protection (#155) + // ================================================================== + + /** + * Protect MokoWaaS extensions after routing. + * + * @return void + * + * @since 02.35.00 + */ + public function onAfterRoute(): void + { + $app = $this->getApplication(); + + if (!$app->isClient('administrator')) + { + return; + } + + $this->protectPlugin(); + } + + /** + * Protect the plugin from being disabled or uninstalled by non-master users. + * Does NOT self-heal (no lock) -- master users can still disable if needed. + * + * @return void + * + * @since 02.03.04 + */ + private function protectPlugin(): void + { + // Ensure protected flag is set (self-healing -- runs once per session) + static $flagChecked = false; + + if (!$flagChecked) + { + $flagChecked = true; + $this->ensureProtectedFlag(); + } + + if (MokoWaaSHelper::isMasterUser()) + { + return; + } + + $app = $this->getApplication(); + $option = $app->input->get('option', ''); + $task = $app->input->get('task', ''); + + // Block non-master from uninstalling MokoWaaS + if ($option === 'com_installer' && strpos($task, 'manage.remove') !== false) + { + $cid = $app->input->get('cid', [], 'array'); + + if ($this->isOurExtension($cid)) + { + $app->enqueueMessage('MokoWaaS cannot be uninstalled.', 'error'); + $app->redirect('index.php?option=com_installer&view=manage'); + } + } + + // Block non-master from disabling via list toggle + if ($option === 'com_plugins' && strpos($task, 'plugins.publish') !== false) + { + $cid = $app->input->get('cid', [], 'array'); + + if ($this->isOurExtension($cid)) + { + $app->enqueueMessage('MokoWaaS cannot be disabled.', 'error'); + $app->redirect('index.php?option=com_plugins'); + } + } + + // Block non-master from viewing or editing MokoWaaS plugin settings + if ($option === 'com_plugins') + { + $view = $app->input->get('view', ''); + $layout = $app->input->get('layout', ''); + $extensionId = (int) $app->input->get('extension_id', 0); + + if (($view === 'plugin' || $layout === 'edit') && $extensionId > 0) + { + $db = Factory::getDbo(); + $query = $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('extension_id') . ' = ' . $extensionId) + ->where($db->quoteName('element') . ' = ' . $db->quote('mokowaas')) + ->where($db->quoteName('type') . ' = ' . $db->quote('plugin')); + + if ((int) $db->setQuery($query)->loadResult() > 0) + { + $app->enqueueMessage('MokoWaaS settings are restricted to the master user.', 'warning'); + $app->redirect('index.php?option=com_plugins'); + } + } + } + } + + /** + * Ensure the protected flag is set on MokoWaaS extensions in the DB. + * + * Sets protected=1, locked=0 so the extension can't be disabled or + * uninstalled but can still receive updates and config changes. + * + * @return void + * + * @since 02.03.10 + */ + private function ensureProtectedFlag(): void + { + try + { + $db = Factory::getDbo(); + + // Set protected=1, locked=0 on MokoWaaS extensions + $query = $db->getQuery(true) + ->update($db->quoteName('#__extensions')) + ->set($db->quoteName('protected') . ' = 1') + ->set($db->quoteName('locked') . ' = 0') + ->where('(' . $db->quoteName('element') . ' = ' . $db->quote('mokowaas') + . ' OR ' . $db->quoteName('element') . ' = ' . $db->quote('pkg_mokowaas') . ')') + ->where($db->quoteName('protected') . ' = 0'); + $db->setQuery($query); + $db->execute(); + + // Ensure update site stays enabled (protected extensions get their update site disabled by Joomla) + $query = $db->getQuery(true) + ->update($db->quoteName('#__update_sites') . ' AS us') + ->join('INNER', $db->quoteName('#__update_sites_extensions') . ' AS use2 ON us.update_site_id = use2.update_site_id') + ->join('INNER', $db->quoteName('#__extensions') . ' AS e ON use2.extension_id = e.extension_id') + ->set('us.enabled = 1') + ->where('us.enabled = 0') + ->where('(' . $db->quoteName('e.element') . ' = ' . $db->quote('mokowaas') + . ' OR ' . $db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokowaas') . ')'); + $db->setQuery($query); + $db->execute(); + } + catch (\Throwable $e) + { + // Non-critical + } + } + + /** + * Check if any of the given extension IDs belong to MokoWaaS. + * + * @param array $ids Extension IDs to check + * + * @return bool + * + * @since 02.03.04 + */ + private function isOurExtension(array $ids): bool + { + if (empty($ids)) + { + return false; + } + + $db = Factory::getDbo(); + $query = $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__extensions')) + ->where($db->quoteName('extension_id') . ' IN (' . implode(',', array_map('intval', $ids)) . ')') + ->where('(' . $db->quoteName('element') . ' = ' . $db->quote('mokowaas') + . ' OR ' . $db->quoteName('element') . ' = ' . $db->quote('pkg_mokowaas') . ')'); + + return (int) $db->setQuery($query)->loadResult() > 0; + } } From 01056afe74749dd4a07ea1c9dc87eb9079f81780 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 20:33:56 -0500 Subject: [PATCH 182/220] fix: menu icons use FA6 for unmapped classes, query all MokoWaaS submenu items - Helpdesk: fa-solid fa-handshake-angle (was icon-headphones, unmapped) - .htaccess: fa-solid fa-file-code (was icon-file-code, unmapped) - Query now finds ALL submenu items under the MokoWaaS parent menu, including those linking to com_plugins, com_installer, com_checkin, com_cache Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/script.php | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/script.php b/src/script.php index 85da88e6..49481545 100644 --- a/src/script.php +++ b/src/script.php @@ -980,8 +980,8 @@ class Pkg_MokowaasInstallerScript $iconMap = [ 'class:cogs' => 'icon-cogs', 'class:puzzle-piece' => 'icon-puzzle-piece', - 'class:headphones' => 'icon-headphones', - 'class:file-code' => 'icon-file-code', + 'class:headphones' => 'fa-solid fa-handshake-angle', + 'class:file-code' => 'fa-solid fa-file-code', 'class:lock' => 'icon-lock', 'class:shield-alt' => 'icon-shield-alt', 'class:database' => 'icon-database', @@ -992,10 +992,15 @@ class Pkg_MokowaasInstallerScript 'class:bolt' => 'icon-bolt', ]; + // Find all MokoWaaS component submenu items (including those linking to other components) $db->setQuery( - "SELECT id, img, params FROM #__menu" - . " WHERE client_id = 1 AND level >= 2" - . " AND link LIKE '%com_mokowaas%'" + $db->getQuery(true) + ->select(['m.id', 'm.img', 'm.params']) + ->from($db->quoteName('#__menu', 'm')) + ->where('m.client_id = 1') + ->where('m.level >= 2') + ->where('m.parent_id IN (SELECT id FROM ' . $db->quoteName('#__menu') + . ' WHERE client_id = 1 AND level = 1 AND link LIKE ' . $db->quote('%com_mokowaas%') . ')') ); foreach ($db->loadObjectList() as $item) From 4ce8c6b4ea7aecaadbfaa5a2052c5cf53f3d9467 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 20:38:51 -0500 Subject: [PATCH 183/220] fix: reduce indent on admin menu module level 2 and 3 items Override Atum's deep padding-left with tighter padding-inline-start (0.5rem for level 2, 0.75rem for level 3 sub-components). Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/mod_mokowaas_menu/tmpl/default.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/packages/mod_mokowaas_menu/tmpl/default.php b/src/packages/mod_mokowaas_menu/tmpl/default.php index 14ff5c97..6c9881d6 100644 --- a/src/packages/mod_mokowaas_menu/tmpl/default.php +++ b/src/packages/mod_mokowaas_menu/tmpl/default.php @@ -116,7 +116,7 @@ $topCollapse = 'collapse-level-1 mm-collapse' . ($anyMokoActive ? ' mm-show' : MokoWaaS -
    +
      @@ -158,7 +158,7 @@ $topCollapse = 'collapse-level-1 mm-collapse' . ($anyMokoActive ? ' mm-show' : -
        +
          Date: Thu, 4 Jun 2026 20:40:32 -0500 Subject: [PATCH 184/220] fix: custom CSS classes for admin menu indent control - .sidebar-wrapper .item-level-1 > a: padding-inline-start 1.5rem - .mokowaas-menu-item > a: 1rem (replaces item-level-2) - .mokowaas-menu-child > a: 1.5rem (replaces item-level-3) Decouples from Atum's deep indentation cascade. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/mod_mokowaas_menu/tmpl/default.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/packages/mod_mokowaas_menu/tmpl/default.php b/src/packages/mod_mokowaas_menu/tmpl/default.php index 6c9881d6..72c2a347 100644 --- a/src/packages/mod_mokowaas_menu/tmpl/default.php +++ b/src/packages/mod_mokowaas_menu/tmpl/default.php @@ -110,6 +110,12 @@ $topClass = 'item parent item-level-1' . ($anyMokoActive ? ' mm-active' : ' $topCollapse = 'collapse-level-1 mm-collapse' . ($anyMokoActive ? ' mm-show' : ''); ?> + +
          • @@ -130,7 +136,7 @@ $topCollapse = 'collapse-level-1 mm-collapse' . ($anyMokoActive ? ' mm-show' : ? ($currentView === '' || $currentView === 'dashboard') : ($currentView === ($parsed['view'] ?? '')); } - $liClass = 'item item-level-2' . ($active ? ' mm-active' : ''); + $liClass = 'item mokowaas-menu-item' . ($active ? ' mm-active' : ''); $aClass = 'no-dropdown' . ($active ? ' mm-active' : ''); ?>
          • @@ -148,7 +154,7 @@ $topCollapse = 'collapse-level-1 mm-collapse' . ($anyMokoActive ? ' mm-show' : parse_str(parse_url($comp['link'], PHP_URL_QUERY) ?? '', $compParsed); $compActive = ($compParsed['option'] ?? '') === $currentOption; $hasChildren = !empty($comp['children']); - $compLiClass = 'item item-level-2' . ($hasChildren ? ' parent' : '') . ($compActive ? ' mm-active' : ''); + $compLiClass = 'item mokowaas-menu-item' . ($hasChildren ? ' parent' : '') . ($compActive ? ' mm-active' : ''); $compAClass = ($hasChildren ? 'has-arrow' : 'no-dropdown') . ($compActive ? ' mm-active' : ''); $childCollapse = 'collapse-level-2 mm-collapse' . ($compActive ? ' mm-show' : ''); ?> @@ -165,7 +171,7 @@ $topCollapse = 'collapse-level-1 mm-collapse' . ($anyMokoActive ? ' mm-show' : parse_str(parse_url($child['link'], PHP_URL_QUERY) ?? '', $childParsed); $childActive = ($childParsed['option'] ?? '') === $currentOption && ($childParsed['view'] ?? '') === $currentView; - $childLiClass = 'item item-level-3' . ($childActive ? ' mm-active' : ''); + $childLiClass = 'item mokowaas-menu-child' . ($childActive ? ' mm-active' : ''); $childAClass = 'no-dropdown' . ($childActive ? ' mm-active' : ''); ?>
          • From 36658fa8ca3cd186d9ce4794aaf1f19b9ea30e15 Mon Sep 17 00:00:00 2001 From: "gitea-actions[bot]" Date: Fri, 5 Jun 2026 01:42:18 +0000 Subject: [PATCH 185/220] chore(version): pre-release bump to 02.34.08-dev [skip ci] --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 2 +- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/AllowedIpsField.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/Field/CurrentIpField.php | 2 +- src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php | 2 +- src/packages/plg_system_mokowaas/Field/NextResetField.php | 2 +- .../plg_system_mokowaas/Field/SnapshotTablesField.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncReceiver.php | 2 +- .../plg_system_mokowaas/Service/ContentSyncService.php | 2 +- src/packages/plg_system_mokowaas/Service/DemoResetService.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 2 +- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 50 files changed, 60 insertions(+), 60 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 3827c185..30071859 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.34.07 + 02.34.08 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 06733262..ab1b8c1a 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.34.07 +# VERSION: 02.34.08 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 30fc47f5..c6336fc9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.34.07 + VERSION: 02.34.08 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ccc178c8..c1a0c1dd 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index c2f0ab3f..9c6a79e8 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 089fecf7..2c84ec0b 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.34.07 + VERSION: 02.34.08 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 268a5c59..1ba0581a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index edad81e1..53bb8ac9 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.34.07 +VERSION: 02.34.08 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index 2d62c14b..d2b7edf5 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.34.07) +# MokoWaaS Build Guide (VERSION: 02.34.08) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 9c1f95a2..edf89e85 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.34.07) +# MokoWaaS Configuration Guide (VERSION: 02.34.08) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 1f1f3ba9..18eee009 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.34.07) +# MokoWaaS Installation Guide (VERSION: 02.34.08) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index a430cc09..6e320c83 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.34.07) +# MokoWaaS Operations Guide (VERSION: 02.34.08) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index bccc4367..d8de58a6 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.07) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.08) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 51168bc7..ad2e6ca9 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.34.07) +# MokoWaaS Testing Guide (VERSION: 02.34.08) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 76497bff..87a15cb2 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.34.07) +# MokoWaaS Troubleshooting Guide (VERSION: 02.34.08) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 2dd936ec..f3ef938b 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.07) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.08) ## Introduction diff --git a/docs/index.md b/docs/index.md index ac8285bd..b29b73de 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.07 + VERSION: 02.34.08 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.34.07) +# MokoWaaS Documentation Index (VERSION: 02.34.08) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index a645a569..8dee650c 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.34.07 + VERSION: 02.34.08 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.34.07) +# MokoWaaS Plugin Overview (VERSION: 02.34.08) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 6eb5d72f..c0d2add7 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.34.07 +VERSION: 02.34.08 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 85c54a64..a1f12e1c 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index 98262444..dfcaff94 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index ac0429a4..cbefb86e 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index aa5ffa8a..4a2fbb16 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index ddee0c9e..587a75b3 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/Extension/MokoWaaS.php * NOTE: Core system plugin for MokoWaaS admin tools suite */ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php index 179a1fe1..77bc48fb 100644 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/Field/AllowedIpsField.php * BRIEF: Custom form field that displays the current IP whitelist */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 5e2ae0a5..0106b1f8 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php index 119844f1..95959e33 100644 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php @@ -7,7 +7,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/Field/CurrentIpField.php * BRIEF: Read-only field that displays the current user's IP address */ diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php index 456b9e27..176f561d 100644 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/Field/DemoTaskInfoField.php * BRIEF: Read-only field showing scheduled task info with link to manage it */ diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php index 696731ca..3a9b3417 100644 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ b/src/packages/plg_system_mokowaas/Field/NextResetField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/Field/NextResetField.php * BRIEF: Read-only field showing next reset time from Joomla scheduled task */ diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php index 68ba44cd..2d827d9e 100644 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/Field/SnapshotTablesField.php * BRIEF: Multi-select list field that loads DB tables with sensible defaults */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php index bacd5b57..b52d592d 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php - * VERSION: 02.34.07 + * VERSION: 02.34.08 * BRIEF: Receiver-side content sync — applies incoming payload to local DB */ diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php index f418eef7..d75888a1 100644 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php - * VERSION: 02.34.07 + * VERSION: 02.34.08 * BRIEF: Sender-side content sync — builds payload and pushes to remote sites */ diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php index 32f5d37e..5cf338ae 100644 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ b/src/packages/plg_system_mokowaas/Service/DemoResetService.php @@ -10,7 +10,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php - * VERSION: 02.34.07 + * VERSION: 02.34.08 * BRIEF: Content-only snapshot/restore for demo site reset */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index d0e80d3c..14bd9ae4 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index db9e336b..a44f91b7 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index feacaf61..e2c0bc7b 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.07 + * VERSION: 02.34.08 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 7795228e..5ff22213 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index e2e60947..0a8a24a9 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 0453eed5..3377c28e 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index df6d3c5b..3b04f941 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 31d2283f..6b4225d0 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index e7c710ba..b20640d8 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index f5ac915e..50d468c4 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 89525ea3..a062e2f5 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 0b833c87..084d9dd9 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index d9e92f04..092f2b1c 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.07-dev + 02.34.08-dev Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index b58730c5..a1d816a5 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.34.07 + * VERSION: 02.34.08 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index db647b38..e227ad72 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.34.07 + * VERSION: 02.34.08 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 1148da51..b171df0f 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.07-dev + 02.34.08-dev 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index dbc249ea..c8b32eed 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From e42d6e759628863e2fc8a3f0ba2c9250679a06b4 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 22:10:28 -0500 Subject: [PATCH 186/220] fix: hardcode branding values in overrides, adjust menu indent, add reset download keys Hardcode {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} placeholders to literal values in all language override .ini files. Adjust admin menu indent (2rem parent, 2.5rem child). Add one-shot reset download keys toggle to DevTools plugin. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../mod_mokowaas_menu/tmpl/default.php | 4 +- .../language/overrides/en-GB.override.ini | 118 +++++++++--------- .../language/overrides/en-US.override.ini | 118 +++++++++--------- .../language/overrides/en-GB.override.ini | 50 ++++---- .../language/overrides/en-US.override.ini | 50 ++++---- .../en-GB/plg_system_mokowaas_devtools.ini | 2 + .../mokowaas_devtools.xml | 8 ++ .../src/Extension/DevTools.php | 44 +++++++ 8 files changed, 220 insertions(+), 174 deletions(-) diff --git a/src/packages/mod_mokowaas_menu/tmpl/default.php b/src/packages/mod_mokowaas_menu/tmpl/default.php index 72c2a347..c2d6cf63 100644 --- a/src/packages/mod_mokowaas_menu/tmpl/default.php +++ b/src/packages/mod_mokowaas_menu/tmpl/default.php @@ -112,8 +112,8 @@ $topCollapse = 'collapse-level-1 mm-collapse' . ($anyMokoActive ? ' mm-show' :
              diff --git a/src/packages/plg_system_mokowaas/administrator/language/overrides/en-GB.override.ini b/src/packages/plg_system_mokowaas/administrator/language/overrides/en-GB.override.ini index ca5081b5..83563e9f 100644 --- a/src/packages/plg_system_mokowaas/administrator/language/overrides/en-GB.override.ini +++ b/src/packages/plg_system_mokowaas/administrator/language/overrides/en-GB.override.ini @@ -10,111 +10,109 @@ ; Version: 02.01.08 ; File: en-GB.override.ini ; Path: administrator/language/overrides/en-GB.override.ini -; Brief: Admin override TEMPLATE — placeholders resolved at runtime/install. -; Notes: Use {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} placeholders. -; Variables: {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} +; Brief: Admin language overrides — values are hardcoded. ; ----------------------------------------------------------------------------- ; ===== Footer & template branding ===== -TPL_ATUM_POWERED_BY="Powered by {{BRAND_NAME}}" -MOD_FOOTER_LINE2="Powered by {{BRAND_NAME}}" +TPL_ATUM_POWERED_BY="Powered by MokoWaaS" +MOD_FOOTER_LINE2="Powered by MokoWaaS" ; ===== Control panel greetings ===== -COM_CPANEL_WELCOME_TITLE="Welcome to {{BRAND_NAME}}!" -COM_CPANEL_MSG_WELCOME="Welcome to {{BRAND_NAME}}!" +COM_CPANEL_WELCOME_TITLE="Welcome to MokoWaaS!" +COM_CPANEL_MSG_WELCOME="Welcome to MokoWaaS!" ; ===== Help/Docs phrasing ===== -COM_ADMIN_HELP_SITE="{{BRAND_NAME}} Help" -COM_ADMIN_HELPSITE_FIELD_LABEL="{{BRAND_NAME}} Help" +COM_ADMIN_HELP_SITE="MokoWaaS Help" +COM_ADMIN_HELPSITE_FIELD_LABEL="MokoWaaS Help" ; ===== Generic replacements ===== -JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="{{BRAND_NAME}} Defaults" -COM_INSTALLER_TYPE_JOOMLA="{{BRAND_NAME}} Package" -LIB_JOOMLA="{{BRAND_NAME}} Library" +JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="MokoWaaS Defaults" +COM_INSTALLER_TYPE_JOOMLA="MokoWaaS Package" +LIB_JOOMLA="MokoWaaS Library" ; ===== System messages ===== -JERROR_JOOMLA="{{BRAND_NAME}} Error" -JFIELD_JOOMLA_LABEL="{{BRAND_NAME}} Field" +JERROR_JOOMLA="MokoWaaS Error" +JFIELD_JOOMLA_LABEL="MokoWaaS Field" ; ===== AdminLogin Support ===== -MOD_LOGINSUPPORT_FORUM="{{COMPANY_NAME}} Support" -MOD_LOGINSUPPORT_DOCUMENTATION="{{BRAND_NAME}} Documentation" -MOD_LOGINSUPPORT_NEWS="{{COMPANY_NAME}} News" -MOD_LOGINSUPPORT_HEADLINE="Need help? Visit {{COMPANY_NAME}}:" -MOD_LOGINSUPPORT_XML_DESCRIPTION="This module displays useful links to {{COMPANY_NAME}} support on the login screen." -TPL_ATUM_BACKEND_LOGIN="{{BRAND_NAME}} Administrator Login" +MOD_LOGINSUPPORT_FORUM="Moko Consulting Support" +MOD_LOGINSUPPORT_DOCUMENTATION="MokoWaaS Documentation" +MOD_LOGINSUPPORT_NEWS="Moko Consulting News" +MOD_LOGINSUPPORT_HEADLINE="Need help? Visit Moko Consulting:" +MOD_LOGINSUPPORT_XML_DESCRIPTION="This module displays useful links to Moko Consulting support on the login screen." +TPL_ATUM_BACKEND_LOGIN="MokoWaaS Administrator Login" ; ===== Error messages ===== JERROR_LAYOUT_ERROR_HAS_OCCURRED="ERROR OCCURRED" ; ===== Admin-specific branding ===== -COM_ADMIN_VIEW_HOME_TITLE="{{BRAND_NAME}} Control Panel" -JLIB_APPLICATION_ERROR_SAVE_FAILED="{{BRAND_NAME}} Error: Save failed" +COM_ADMIN_VIEW_HOME_TITLE="MokoWaaS Control Panel" +JLIB_APPLICATION_ERROR_SAVE_FAILED="MokoWaaS Error: Save failed" ; ===== Module list workaround (RegularLabs) ===== COM_MODULES_HEADING_POSITION="Position" ; ===== Extensions ===== -COM_INSTALLER_TYPE_TYPE_JOOMLA="{{BRAND_NAME}}" +COM_INSTALLER_TYPE_TYPE_JOOMLA="MokoWaaS" COM_INSTALLER_MSG_UPDATE_SUCCESS="Update installed successfully" ; ===== Dashboard ===== -COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to {{BRAND_NAME}}!" -COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="

              Community resources are available for new users.

              " -COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in {{BRAND_NAME}}" +COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to MokoWaaS!" +COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="

              Community resources are available for new users.

              " +COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in MokoWaaS" ; ===== Quick Icons ===== -PLG_QUICKICON_JOOMLAUPDATE_CHECKING="Checking {{BRAND_NAME}}…" -PLG_QUICKICON_JOOMLAUPDATE_ERROR="Unknown {{BRAND_NAME}}…" -PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="{{BRAND_NAME}} is up to date." +PLG_QUICKICON_JOOMLAUPDATE_CHECKING="Checking MokoWaaS…" +PLG_QUICKICON_JOOMLAUPDATE_ERROR="Unknown MokoWaaS…" +PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="MokoWaaS is up to date." ; ===== System Info ===== -COM_ADMIN_JOOMLA_VERSION="{{BRAND_NAME}} Version" -COM_ADMIN_HELP="{{BRAND_NAME}} Help" -COM_ADMIN_JOOMLA_COMPAT_PLUGIN="{{BRAND_NAME}} Backward Compatibility Plugin" +COM_ADMIN_JOOMLA_VERSION="MokoWaaS Version" +COM_ADMIN_HELP="MokoWaaS Help" +COM_ADMIN_JOOMLA_COMPAT_PLUGIN="MokoWaaS Backward Compatibility Plugin" ; ===== Installer ===== -COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install {{BRAND_NAME}} Extension" -COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The {{BRAND_NAME}} package cannot be installed through the Extension Manager. Please use the {{BRAND_NAME}} Update component to update." -COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The {{BRAND_NAME}} temporary folder is not set." -COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE="The {{BRAND_NAME}} temporary folder is not writable or does not exist." -COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your {{BRAND_NAME}} installation.
              You are strongly advised to make a backup of your site's files and database before you start updating." +COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install MokoWaaS Extension" +COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The MokoWaaS package cannot be installed through the Extension Manager. Please use the MokoWaaS Update component to update." +COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The MokoWaaS temporary folder is not set." +COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE="The MokoWaaS temporary folder is not writable or does not exist." +COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your MokoWaaS installation.
              You are strongly advised to make a backup of your site's files and database before you start updating." ; ===== Global Configuration ===== -COM_CONFIG_FIELD_METAVERSION_LABEL="{{BRAND_NAME}} Version" +COM_CONFIG_FIELD_METAVERSION_LABEL="MokoWaaS Version" ; ===== Update component ===== -COM_JOOMLAUPDATE_CONFIGURATION="{{BRAND_NAME}} Update: Options" -COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="{{BRAND_NAME}} Next" -COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC="Configure where {{BRAND_NAME}} gets its update information from." +COM_JOOMLAUPDATE_CONFIGURATION="MokoWaaS Update: Options" +COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="MokoWaaS Next" +COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC="Configure where MokoWaaS gets its update information from." COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL="Update Channel" -COM_JOOMLAUPDATE_VIEW_DEFAULT_TITLE="{{BRAND_NAME}} Update" -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION="{{BRAND_NAME}} Update Component" -COM_JOOMLAUPDATE_NOCHANGE="{{BRAND_NAME}} is up to date." -COM_JOOMLAUPDATE_PREUPDATE_CHECK="{{BRAND_NAME}} Pre-Update Check" -COM_JOOMLAUPDATE_UPDATE_HEADER="{{BRAND_NAME}} Update" +COM_JOOMLAUPDATE_VIEW_DEFAULT_TITLE="MokoWaaS Update" +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION="MokoWaaS Update Component" +COM_JOOMLAUPDATE_NOCHANGE="MokoWaaS is up to date." +COM_JOOMLAUPDATE_PREUPDATE_CHECK="MokoWaaS Pre-Update Check" +COM_JOOMLAUPDATE_UPDATE_HEADER="MokoWaaS Update" COM_JOOMLAUPDATE_LIVEUPDATE="Live Update" -COM_JOOMLAUPDATE_CHECKEDFOR_UPDATES="Checked for {{BRAND_NAME}} updates." +COM_JOOMLAUPDATE_CHECKEDFOR_UPDATES="Checked for MokoWaaS updates." ; ===== Privacy ===== -COM_PRIVACY_HEADING_CORE_CAPABILITIES="{{BRAND_NAME}} Core Capabilities" +COM_PRIVACY_HEADING_CORE_CAPABILITIES="MokoWaaS Core Capabilities" ; ===== Database & Library errors ===== -JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum {{BRAND_NAME}} version requirement of J%s" -JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE="Installer: Can't find {{BRAND_NAME}} XML setup file." +JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum MokoWaaS version requirement of J%s" +JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE="Installer: Can't find MokoWaaS XML setup file." ; ===== Version and About ===== -JLIB_HTML_POWERED_BY="Powered by {{BRAND_NAME}}" -COM_ADMIN_HELP_DOCUMENTATION="{{BRAND_NAME}} Documentation" -COM_ADMIN_HELP_SUPPORT="{{BRAND_NAME}} Support" +JLIB_HTML_POWERED_BY="Powered by MokoWaaS" +COM_ADMIN_HELP_DOCUMENTATION="MokoWaaS Documentation" +COM_ADMIN_HELP_SUPPORT="MokoWaaS Support" ; ===== Akeeba Ticket System (ATS) ===== -COM_ATS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKETS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKET="{{BRAND_NAME}} Ticket" -COM_ATS_TITLE_NEWTICKET="New {{BRAND_NAME}} Ticket" +COM_ATS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKETS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKET="MokoWaaS Ticket" +COM_ATS_TITLE_NEWTICKET="New MokoWaaS Ticket" COM_ATS_TITLE_CATEGORIES="Ticket Categories" -COM_ATS_MSG_TICKET_SAVED="Your {{BRAND_NAME}} ticket has been saved." -COM_ATS_MSG_TICKET_CLOSED="Your {{BRAND_NAME}} ticket has been closed." +COM_ATS_MSG_TICKET_SAVED="Your MokoWaaS ticket has been saved." +COM_ATS_MSG_TICKET_CLOSED="Your MokoWaaS ticket has been closed." COM_ATS_MSG_REPLY_SAVED="Your reply has been saved." -COM_ATS_LBL_POWEREDBY="Powered by {{BRAND_NAME}}" +COM_ATS_LBL_POWEREDBY="Powered by MokoWaaS" diff --git a/src/packages/plg_system_mokowaas/administrator/language/overrides/en-US.override.ini b/src/packages/plg_system_mokowaas/administrator/language/overrides/en-US.override.ini index 02fc67f7..94da3e27 100644 --- a/src/packages/plg_system_mokowaas/administrator/language/overrides/en-US.override.ini +++ b/src/packages/plg_system_mokowaas/administrator/language/overrides/en-US.override.ini @@ -10,111 +10,109 @@ ; Version: 02.01.08 ; File: en-US.override.ini ; Path: administrator/language/overrides/en-US.override.ini -; Brief: Admin override TEMPLATE — placeholders resolved at runtime/install. -; Notes: Use {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} placeholders. -; Variables: {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} +; Brief: Admin language overrides — values are hardcoded. ; ----------------------------------------------------------------------------- ; ===== Footer & template branding ===== -TPL_ATUM_POWERED_BY="Powered by {{BRAND_NAME}}" -MOD_FOOTER_LINE2="Powered by {{BRAND_NAME}}" +TPL_ATUM_POWERED_BY="Powered by MokoWaaS" +MOD_FOOTER_LINE2="Powered by MokoWaaS" ; ===== Control panel greetings ===== -COM_CPANEL_WELCOME_TITLE="Welcome to {{BRAND_NAME}}!" -COM_CPANEL_MSG_WELCOME="Welcome to {{BRAND_NAME}}!" +COM_CPANEL_WELCOME_TITLE="Welcome to MokoWaaS!" +COM_CPANEL_MSG_WELCOME="Welcome to MokoWaaS!" ; ===== Help/Docs phrasing ===== -COM_ADMIN_HELP_SITE="{{BRAND_NAME}} Help" -COM_ADMIN_HELPSITE_FIELD_LABEL="{{BRAND_NAME}} Help" +COM_ADMIN_HELP_SITE="MokoWaaS Help" +COM_ADMIN_HELPSITE_FIELD_LABEL="MokoWaaS Help" ; ===== Generic replacements ===== -JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="{{BRAND_NAME}} Defaults" -COM_INSTALLER_TYPE_JOOMLA="{{BRAND_NAME}} Package" -LIB_JOOMLA="{{BRAND_NAME}} Library" +JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="MokoWaaS Defaults" +COM_INSTALLER_TYPE_JOOMLA="MokoWaaS Package" +LIB_JOOMLA="MokoWaaS Library" ; ===== System messages ===== -JERROR_JOOMLA="{{BRAND_NAME}} Error" -JFIELD_JOOMLA_LABEL="{{BRAND_NAME}} Field" +JERROR_JOOMLA="MokoWaaS Error" +JFIELD_JOOMLA_LABEL="MokoWaaS Field" ; ===== AdminLogin Support ===== -MOD_LOGINSUPPORT_FORUM="{{COMPANY_NAME}} Support" -MOD_LOGINSUPPORT_DOCUMENTATION="{{BRAND_NAME}} Documentation" -MOD_LOGINSUPPORT_NEWS="{{COMPANY_NAME}} News" -MOD_LOGINSUPPORT_HEADLINE="Need help? Visit {{COMPANY_NAME}}:" -MOD_LOGINSUPPORT_XML_DESCRIPTION="This module displays useful links to {{COMPANY_NAME}} support on the login screen." -TPL_ATUM_BACKEND_LOGIN="{{BRAND_NAME}} Administrator Login" +MOD_LOGINSUPPORT_FORUM="Moko Consulting Support" +MOD_LOGINSUPPORT_DOCUMENTATION="MokoWaaS Documentation" +MOD_LOGINSUPPORT_NEWS="Moko Consulting News" +MOD_LOGINSUPPORT_HEADLINE="Need help? Visit Moko Consulting:" +MOD_LOGINSUPPORT_XML_DESCRIPTION="This module displays useful links to Moko Consulting support on the login screen." +TPL_ATUM_BACKEND_LOGIN="MokoWaaS Administrator Login" ; ===== Error messages ===== JERROR_LAYOUT_ERROR_HAS_OCCURRED="ERROR OCCURRED" ; ===== Admin-specific branding ===== -COM_ADMIN_VIEW_HOME_TITLE="{{BRAND_NAME}} Control Panel" -JLIB_APPLICATION_ERROR_SAVE_FAILED="{{BRAND_NAME}} Error: Save failed" +COM_ADMIN_VIEW_HOME_TITLE="MokoWaaS Control Panel" +JLIB_APPLICATION_ERROR_SAVE_FAILED="MokoWaaS Error: Save failed" ; ===== Module list workaround (RegularLabs) ===== COM_MODULES_HEADING_POSITION="Position" ; ===== Extensions ===== -COM_INSTALLER_TYPE_TYPE_JOOMLA="{{BRAND_NAME}}" +COM_INSTALLER_TYPE_TYPE_JOOMLA="MokoWaaS" COM_INSTALLER_MSG_UPDATE_SUCCESS="Update installed successfully" ; ===== Dashboard ===== -COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to {{BRAND_NAME}}!" -COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="

              Community resources are available for new users.

              " -COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in {{BRAND_NAME}}" +COM_CPANEL_WELCOME_BEGINNERS_TITLE="Welcome to MokoWaaS!" +COM_CPANEL_WELCOME_BEGINNERS_MESSAGE="

              Community resources are available for new users.

              " +COM_CPANEL_MSG_STATS_COLLECTION_TITLE="Stats Collection in MokoWaaS" ; ===== Quick Icons ===== -PLG_QUICKICON_JOOMLAUPDATE_CHECKING="Checking {{BRAND_NAME}}…" -PLG_QUICKICON_JOOMLAUPDATE_ERROR="Unknown {{BRAND_NAME}}…" -PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="{{BRAND_NAME}} is up to date." +PLG_QUICKICON_JOOMLAUPDATE_CHECKING="Checking MokoWaaS…" +PLG_QUICKICON_JOOMLAUPDATE_ERROR="Unknown MokoWaaS…" +PLG_QUICKICON_JOOMLAUPDATE_UPTODATE="MokoWaaS is up to date." ; ===== System Info ===== -COM_ADMIN_JOOMLA_VERSION="{{BRAND_NAME}} Version" -COM_ADMIN_HELP="{{BRAND_NAME}} Help" -COM_ADMIN_JOOMLA_COMPAT_PLUGIN="{{BRAND_NAME}} Backward Compatibility Plugin" +COM_ADMIN_JOOMLA_VERSION="MokoWaaS Version" +COM_ADMIN_HELP="MokoWaaS Help" +COM_ADMIN_JOOMLA_COMPAT_PLUGIN="MokoWaaS Backward Compatibility Plugin" ; ===== Installer ===== -COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install {{BRAND_NAME}} Extension" -COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The {{BRAND_NAME}} package cannot be installed through the Extension Manager. Please use the {{BRAND_NAME}} Update component to update." -COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The {{BRAND_NAME}} temporary folder is not set." -COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE="The {{BRAND_NAME}} temporary folder is not writable or does not exist." -COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your {{BRAND_NAME}} installation.
              You are strongly advised to make a backup of your site's files and database before you start updating." +COM_INSTALLER_UPLOAD_INSTALL_JOOMLA_EXTENSION="Upload & Install MokoWaaS Extension" +COM_INSTALLER_UNABLE_TO_INSTALL_JOOMLA_PACKAGE="The MokoWaaS package cannot be installed through the Extension Manager. Please use the MokoWaaS Update component to update." +COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTSET="The MokoWaaS temporary folder is not set." +COM_INSTALLER_MSG_WARNINGS_JOOMLATMPNOTWRITEABLE="The MokoWaaS temporary folder is not writable or does not exist." +COM_INSTALLER_MSG_WARNINGS_UPDATE_NOTICE="Before updating ensure that the update is compatible with your MokoWaaS installation.
              You are strongly advised to make a backup of your site's files and database before you start updating." ; ===== Global Configuration ===== -COM_CONFIG_FIELD_METAVERSION_LABEL="{{BRAND_NAME}} Version" +COM_CONFIG_FIELD_METAVERSION_LABEL="MokoWaaS Version" ; ===== Update component ===== -COM_JOOMLAUPDATE_CONFIGURATION="{{BRAND_NAME}} Update: Options" -COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="{{BRAND_NAME}} Next" -COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC="Configure where {{BRAND_NAME}} gets its update information from." +COM_JOOMLAUPDATE_CONFIGURATION="MokoWaaS Update: Options" +COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_NEXT="MokoWaaS Next" +COM_JOOMLAUPDATE_CONFIG_SOURCES_DESC="Configure where MokoWaaS gets its update information from." COM_JOOMLAUPDATE_CONFIG_UPDATESOURCE_LABEL="Update Channel" -COM_JOOMLAUPDATE_VIEW_DEFAULT_TITLE="{{BRAND_NAME}} Update" -COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION="{{BRAND_NAME}} Update Component" -COM_JOOMLAUPDATE_NOCHANGE="{{BRAND_NAME}} is up to date." -COM_JOOMLAUPDATE_PREUPDATE_CHECK="{{BRAND_NAME}} Pre-Update Check" -COM_JOOMLAUPDATE_UPDATE_HEADER="{{BRAND_NAME}} Update" +COM_JOOMLAUPDATE_VIEW_DEFAULT_TITLE="MokoWaaS Update" +COM_JOOMLAUPDATE_VIEW_DEFAULT_DESCRIPTION="MokoWaaS Update Component" +COM_JOOMLAUPDATE_NOCHANGE="MokoWaaS is up to date." +COM_JOOMLAUPDATE_PREUPDATE_CHECK="MokoWaaS Pre-Update Check" +COM_JOOMLAUPDATE_UPDATE_HEADER="MokoWaaS Update" COM_JOOMLAUPDATE_LIVEUPDATE="Live Update" -COM_JOOMLAUPDATE_CHECKEDFOR_UPDATES="Checked for {{BRAND_NAME}} updates." +COM_JOOMLAUPDATE_CHECKEDFOR_UPDATES="Checked for MokoWaaS updates." ; ===== Privacy ===== -COM_PRIVACY_HEADING_CORE_CAPABILITIES="{{BRAND_NAME}} Core Capabilities" +COM_PRIVACY_HEADING_CORE_CAPABILITIES="MokoWaaS Core Capabilities" ; ===== Database & Library errors ===== -JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum {{BRAND_NAME}} version requirement of J%s" -JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE="Installer: Can't find {{BRAND_NAME}} XML setup file." +JLIB_INSTALLER_MINIMUM_JOOMLA="You don't have the minimum MokoWaaS version requirement of J%s" +JLIB_INSTALLER_ERROR_NOTFINDJOOMLAXMLSETUPFILE="Installer: Can't find MokoWaaS XML setup file." ; ===== Version and About ===== -JLIB_HTML_POWERED_BY="Powered by {{BRAND_NAME}}" -COM_ADMIN_HELP_DOCUMENTATION="{{BRAND_NAME}} Documentation" -COM_ADMIN_HELP_SUPPORT="{{BRAND_NAME}} Support" +JLIB_HTML_POWERED_BY="Powered by MokoWaaS" +COM_ADMIN_HELP_DOCUMENTATION="MokoWaaS Documentation" +COM_ADMIN_HELP_SUPPORT="MokoWaaS Support" ; ===== Akeeba Ticket System (ATS) ===== -COM_ATS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKETS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKET="{{BRAND_NAME}} Ticket" -COM_ATS_TITLE_NEWTICKET="New {{BRAND_NAME}} Ticket" +COM_ATS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKETS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKET="MokoWaaS Ticket" +COM_ATS_TITLE_NEWTICKET="New MokoWaaS Ticket" COM_ATS_TITLE_CATEGORIES="Ticket Categories" -COM_ATS_MSG_TICKET_SAVED="Your {{BRAND_NAME}} ticket has been saved." -COM_ATS_MSG_TICKET_CLOSED="Your {{BRAND_NAME}} ticket has been closed." +COM_ATS_MSG_TICKET_SAVED="Your MokoWaaS ticket has been saved." +COM_ATS_MSG_TICKET_CLOSED="Your MokoWaaS ticket has been closed." COM_ATS_MSG_REPLY_SAVED="Your reply has been saved." -COM_ATS_LBL_POWEREDBY="Powered by {{BRAND_NAME}}" +COM_ATS_LBL_POWEREDBY="Powered by MokoWaaS" diff --git a/src/packages/plg_system_mokowaas/language/overrides/en-GB.override.ini b/src/packages/plg_system_mokowaas/language/overrides/en-GB.override.ini index d773e7b7..b33bf0e4 100644 --- a/src/packages/plg_system_mokowaas/language/overrides/en-GB.override.ini +++ b/src/packages/plg_system_mokowaas/language/overrides/en-GB.override.ini @@ -10,38 +10,36 @@ ; Version: 02.01.08 ; File: en-GB.override.ini ; Path: language/overrides/en-GB.override.ini -; Brief: Site/frontend override TEMPLATE — placeholders resolved at runtime/install. -; Notes: Use {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} placeholders. -; Variables: {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} +; Brief: Site/frontend language overrides — values are hardcoded. ; ----------------------------------------------------------------------------- ; ===== Footer & template branding ===== -TPL_CASSIOPEIA_POWERED_BY="Powered by {{BRAND_NAME}}" -MOD_FOOTER_LINE2="Powered by {{BRAND_NAME}}" +TPL_CASSIOPEIA_POWERED_BY="Powered by MokoWaaS" +MOD_FOOTER_LINE2="Powered by MokoWaaS" ; ===== Generic replacements ===== -JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="{{BRAND_NAME}} Defaults" -LIB_JOOMLA="{{BRAND_NAME}} Library" +JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="MokoWaaS Defaults" +LIB_JOOMLA="MokoWaaS Library" ; ===== System messages ===== -JERROR_JOOMLA="{{BRAND_NAME}} Error" -JFIELD_JOOMLA_LABEL="{{BRAND_NAME}} Field" +JERROR_JOOMLA="MokoWaaS Error" +JFIELD_JOOMLA_LABEL="MokoWaaS Field" ; ===== Error messages ===== JERROR_LAYOUT_ERROR_HAS_OCCURRED="ERROR OCCURRED" ; ===== Installer / Sample data ===== -INSTL_SITE_NAME_LABEL="{{BRAND_NAME}} Site Name" -INSTL_SAMPLE_BLOG_SET="{{BRAND_NAME}} Sample Data - Blog" -INSTL_SAMPLE_BROCHURE_SET="{{BRAND_NAME}} Sample Data - Brochure Site" -INSTL_SAMPLE_DATA_SET="{{BRAND_NAME}} Sample Data - Default" -INSTL_SAMPLE_LEARN_SET="{{BRAND_NAME}} Sample Data - Learn" -INSTL_SAMPLE_TESTING_SET="{{BRAND_NAME}} Sample Data - Testing" +INSTL_SITE_NAME_LABEL="MokoWaaS Site Name" +INSTL_SAMPLE_BLOG_SET="MokoWaaS Sample Data - Blog" +INSTL_SAMPLE_BROCHURE_SET="MokoWaaS Sample Data - Brochure Site" +INSTL_SAMPLE_DATA_SET="MokoWaaS Sample Data - Default" +INSTL_SAMPLE_LEARN_SET="MokoWaaS Sample Data - Learn" +INSTL_SAMPLE_TESTING_SET="MokoWaaS Sample Data - Testing" ; ===== Login support ===== -MOD_LOGINSUPPORT_FORUM="{{COMPANY_NAME}} Support" -MOD_LOGINSUPPORT_DOCUMENTATION="{{BRAND_NAME}} Documentation" -MOD_LOGINSUPPORT_NEWS="{{COMPANY_NAME}} News" +MOD_LOGINSUPPORT_FORUM="Moko Consulting Support" +MOD_LOGINSUPPORT_DOCUMENTATION="MokoWaaS Documentation" +MOD_LOGINSUPPORT_NEWS="Moko Consulting News" ; ===== Site offline ===== JOFFLINE_MESSAGE="This site is down for maintenance.
              Please check back again soon." @@ -52,15 +50,15 @@ JERROR_AN_ERROR_HAS_OCCURRED="An error has occurred." JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND="Component not found." ; ===== Version and About ===== -JLIB_HTML_POWERED_BY="Powered by {{BRAND_NAME}}" +JLIB_HTML_POWERED_BY="Powered by MokoWaaS" ; ===== Akeeba Ticket System (ATS) ===== -COM_ATS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKETS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKET="{{BRAND_NAME}} Ticket" -COM_ATS_TITLE_NEWTICKET="New {{BRAND_NAME}} Ticket" +COM_ATS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKETS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKET="MokoWaaS Ticket" +COM_ATS_TITLE_NEWTICKET="New MokoWaaS Ticket" COM_ATS_TITLE_CATEGORIES="Ticket Categories" -COM_ATS_MSG_TICKET_SAVED="Your {{BRAND_NAME}} ticket has been saved." -COM_ATS_MSG_TICKET_CLOSED="Your {{BRAND_NAME}} ticket has been closed." +COM_ATS_MSG_TICKET_SAVED="Your MokoWaaS ticket has been saved." +COM_ATS_MSG_TICKET_CLOSED="Your MokoWaaS ticket has been closed." COM_ATS_MSG_REPLY_SAVED="Your reply has been saved." -COM_ATS_LBL_POWEREDBY="Powered by {{BRAND_NAME}}" +COM_ATS_LBL_POWEREDBY="Powered by MokoWaaS" diff --git a/src/packages/plg_system_mokowaas/language/overrides/en-US.override.ini b/src/packages/plg_system_mokowaas/language/overrides/en-US.override.ini index a23405ed..51067385 100644 --- a/src/packages/plg_system_mokowaas/language/overrides/en-US.override.ini +++ b/src/packages/plg_system_mokowaas/language/overrides/en-US.override.ini @@ -10,38 +10,36 @@ ; Version: 02.01.08 ; File: en-US.override.ini ; Path: language/overrides/en-US.override.ini -; Brief: Site/frontend override TEMPLATE — placeholders resolved at runtime/install. -; Notes: Use {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} placeholders. -; Variables: {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} +; Brief: Site/frontend language overrides — values are hardcoded. ; ----------------------------------------------------------------------------- ; ===== Footer & template branding ===== -TPL_CASSIOPEIA_POWERED_BY="Powered by {{BRAND_NAME}}" -MOD_FOOTER_LINE2="Powered by {{BRAND_NAME}}" +TPL_CASSIOPEIA_POWERED_BY="Powered by MokoWaaS" +MOD_FOOTER_LINE2="Powered by MokoWaaS" ; ===== Generic replacements ===== -JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="{{BRAND_NAME}} Defaults" -LIB_JOOMLA="{{BRAND_NAME}} Library" +JGLOBAL_FIELDSET_JOOMLA_DEFAULTS="MokoWaaS Defaults" +LIB_JOOMLA="MokoWaaS Library" ; ===== System messages ===== -JERROR_JOOMLA="{{BRAND_NAME}} Error" -JFIELD_JOOMLA_LABEL="{{BRAND_NAME}} Field" +JERROR_JOOMLA="MokoWaaS Error" +JFIELD_JOOMLA_LABEL="MokoWaaS Field" ; ===== Error messages ===== JERROR_LAYOUT_ERROR_HAS_OCCURRED="ERROR OCCURRED" ; ===== Installer / Sample data ===== -INSTL_SITE_NAME_LABEL="{{BRAND_NAME}} Site Name" -INSTL_SAMPLE_BLOG_SET="{{BRAND_NAME}} Sample Data - Blog" -INSTL_SAMPLE_BROCHURE_SET="{{BRAND_NAME}} Sample Data - Brochure Site" -INSTL_SAMPLE_DATA_SET="{{BRAND_NAME}} Sample Data - Default" -INSTL_SAMPLE_LEARN_SET="{{BRAND_NAME}} Sample Data - Learn" -INSTL_SAMPLE_TESTING_SET="{{BRAND_NAME}} Sample Data - Testing" +INSTL_SITE_NAME_LABEL="MokoWaaS Site Name" +INSTL_SAMPLE_BLOG_SET="MokoWaaS Sample Data - Blog" +INSTL_SAMPLE_BROCHURE_SET="MokoWaaS Sample Data - Brochure Site" +INSTL_SAMPLE_DATA_SET="MokoWaaS Sample Data - Default" +INSTL_SAMPLE_LEARN_SET="MokoWaaS Sample Data - Learn" +INSTL_SAMPLE_TESTING_SET="MokoWaaS Sample Data - Testing" ; ===== Login support ===== -MOD_LOGINSUPPORT_FORUM="{{COMPANY_NAME}} Support" -MOD_LOGINSUPPORT_DOCUMENTATION="{{BRAND_NAME}} Documentation" -MOD_LOGINSUPPORT_NEWS="{{COMPANY_NAME}} News" +MOD_LOGINSUPPORT_FORUM="Moko Consulting Support" +MOD_LOGINSUPPORT_DOCUMENTATION="MokoWaaS Documentation" +MOD_LOGINSUPPORT_NEWS="Moko Consulting News" ; ===== Site offline ===== JOFFLINE_MESSAGE="This site is down for maintenance.
              Please check back again soon." @@ -52,15 +50,15 @@ JERROR_AN_ERROR_HAS_OCCURRED="An error has occurred." JLIB_APPLICATION_ERROR_COMPONENT_NOT_FOUND="Component not found." ; ===== Version and About ===== -JLIB_HTML_POWERED_BY="Powered by {{BRAND_NAME}}" +JLIB_HTML_POWERED_BY="Powered by MokoWaaS" ; ===== Akeeba Ticket System (ATS) ===== -COM_ATS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKETS="{{BRAND_NAME}} Tickets" -COM_ATS_TITLE_TICKET="{{BRAND_NAME}} Ticket" -COM_ATS_TITLE_NEWTICKET="New {{BRAND_NAME}} Ticket" +COM_ATS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKETS="MokoWaaS Tickets" +COM_ATS_TITLE_TICKET="MokoWaaS Ticket" +COM_ATS_TITLE_NEWTICKET="New MokoWaaS Ticket" COM_ATS_TITLE_CATEGORIES="Ticket Categories" -COM_ATS_MSG_TICKET_SAVED="Your {{BRAND_NAME}} ticket has been saved." -COM_ATS_MSG_TICKET_CLOSED="Your {{BRAND_NAME}} ticket has been closed." +COM_ATS_MSG_TICKET_SAVED="Your MokoWaaS ticket has been saved." +COM_ATS_MSG_TICKET_CLOSED="Your MokoWaaS ticket has been closed." COM_ATS_MSG_REPLY_SAVED="Your reply has been saved." -COM_ATS_LBL_POWEREDBY="Powered by {{BRAND_NAME}}" +COM_ATS_LBL_POWEREDBY="Powered by MokoWaaS" diff --git a/src/packages/plg_system_mokowaas_devtools/language/en-GB/plg_system_mokowaas_devtools.ini b/src/packages/plg_system_mokowaas_devtools/language/en-GB/plg_system_mokowaas_devtools.ini index 8fb821be..b4c72a05 100644 --- a/src/packages/plg_system_mokowaas_devtools/language/en-GB/plg_system_mokowaas_devtools.ini +++ b/src/packages/plg_system_mokowaas_devtools/language/en-GB/plg_system_mokowaas_devtools.ini @@ -13,3 +13,5 @@ PLG_SYSTEM_MOKOWAAS_DEVTOOLS_RESET_HITS_LABEL="Reset All Hits" PLG_SYSTEM_MOKOWAAS_DEVTOOLS_RESET_HITS_DESC="One-shot: reset article hit counters on save. Automatically turns off after execution." PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DELETE_VERSIONS_LABEL="Delete All Versions" PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DELETE_VERSIONS_DESC="One-shot: delete all content version history on save. Automatically turns off after execution." +PLG_SYSTEM_MOKOWAAS_DEVTOOLS_RESET_DLKEYS_LABEL="Reset Download Keys" +PLG_SYSTEM_MOKOWAAS_DEVTOOLS_RESET_DLKEYS_DESC="One-shot: clear all download keys (dlid) from update sites on save. Automatically turns off after execution." diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 7795228e..a0b73825 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -52,6 +52,14 @@ + + + + + diff --git a/src/packages/plg_system_mokowaas_devtools/src/Extension/DevTools.php b/src/packages/plg_system_mokowaas_devtools/src/Extension/DevTools.php index cc6f5a90..1b811628 100644 --- a/src/packages/plg_system_mokowaas_devtools/src/Extension/DevTools.php +++ b/src/packages/plg_system_mokowaas_devtools/src/Extension/DevTools.php @@ -111,6 +111,13 @@ class DevTools extends CMSPlugin implements SubscriberInterface $params->set('delete_versions', 0); } + // Reset download keys on save if toggled on + if ($params->get('reset_download_keys', 0)) + { + $this->resetDownloadKeys(); + $params->set('reset_download_keys', 0); + } + // Reset the one-shot toggles if ($table->params !== $params->toString()) { @@ -152,4 +159,41 @@ class DevTools extends CMSPlugin implements SubscriberInterface return $count; } + + private function resetDownloadKeys(): int + { + $db = Factory::getDbo(); + + // Find update sites that have a dlid in extra_query + $db->setQuery( + $db->getQuery(true) + ->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')]) + ->from($db->quoteName('#__update_sites')) + ->where($db->quoteName('extra_query') . ' LIKE ' . $db->quote('%dlid=%')) + ); + + $sites = $db->loadObjectList(); + $count = 0; + + foreach ($sites as $site) + { + // Parse the query string, remove dlid, rebuild + parse_str($site->extra_query, $parsed); + unset($parsed['dlid']); + $newQuery = http_build_query($parsed); + + $db->setQuery( + $db->getQuery(true) + ->update($db->quoteName('#__update_sites')) + ->set($db->quoteName('extra_query') . ' = ' . $db->quote($newQuery)) + ->where($db->quoteName('update_site_id') . ' = ' . (int) $site->update_site_id) + )->execute(); + + $count++; + } + + $this->getApplication()->enqueueMessage(\sprintf('Cleared download keys from %d update sites.', $count), 'message'); + + return $count; + } } From 384b8824c67d7828df3e1be99432d39de30d8fcb Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Thu, 4 Jun 2026 22:18:47 -0500 Subject: [PATCH 187/220] refactor: remove tpl_mokoonyx submodule Template is managed independently; submodule reference no longer needed. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .gitmodules | 4 ---- src/packages/tpl_mokoonyx | 1 - 2 files changed, 5 deletions(-) delete mode 160000 src/packages/tpl_mokoonyx diff --git a/.gitmodules b/.gitmodules index f6b1e884..e69de29b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +0,0 @@ -[submodule "src/packages/tpl_mokoonyx"] - path = src/packages/tpl_mokoonyx - url = https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx.git - branch = main diff --git a/src/packages/tpl_mokoonyx b/src/packages/tpl_mokoonyx deleted file mode 160000 index f3897495..00000000 --- a/src/packages/tpl_mokoonyx +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f3897495ad93eb9ea8be53bfe2e643c22fd09dec From 93c82a9cee4baaddf2fb582616ac944438166294 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 05:47:13 -0500 Subject: [PATCH 188/220] refactor: strip core plugin to heartbeat-only config Remove branding, security hardening, demo mode, content sync, and API actions from the core plugin. Config now shows only the heartbeat token. Extension class reduced from 4226 to 2051 lines. Deleted 5 Field classes, 3 Service classes, 2 form XMLs, and media assets. Core retains health checks, Grafana provisioning, site aliases, and extension cascade. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../Extension/MokoWaaS.php | 2187 +---------------- .../Field/AllowedIpsField.php | 72 - .../Field/CurrentIpField.php | 40 - .../Field/DemoTaskInfoField.php | 237 -- .../Field/NextResetField.php | 156 -- .../Field/SnapshotTablesField.php | 175 -- .../Service/ContentSyncReceiver.php | 819 ------ .../Service/ContentSyncService.php | 634 ----- .../Service/DemoResetService.php | 606 ----- .../plg_system_mokowaas/Service/index.html | 1 - .../forms/sync_target_entry.xml | 15 - .../forms/trusted_ip_entry.xml | 28 - .../language/en-GB/plg_system_mokowaas.ini | 172 +- .../language/en-US/plg_system_mokowaas.ini | 172 +- .../plg_system_mokowaas/media/favicon.ico | Bin 15086 -> 0 bytes .../plg_system_mokowaas/media/favicon.svg | 97 - .../plg_system_mokowaas/media/favicon_256.png | Bin 75434 -> 0 bytes .../plg_system_mokowaas/media/index.html | 0 .../plg_system_mokowaas/media/logo.png | Bin 77966 -> 0 bytes src/packages/plg_system_mokowaas/mokowaas.xml | 47 +- 20 files changed, 19 insertions(+), 5439 deletions(-) delete mode 100644 src/packages/plg_system_mokowaas/Field/AllowedIpsField.php delete mode 100644 src/packages/plg_system_mokowaas/Field/CurrentIpField.php delete mode 100644 src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php delete mode 100644 src/packages/plg_system_mokowaas/Field/NextResetField.php delete mode 100644 src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php delete mode 100644 src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php delete mode 100644 src/packages/plg_system_mokowaas/Service/ContentSyncService.php delete mode 100644 src/packages/plg_system_mokowaas/Service/DemoResetService.php delete mode 100644 src/packages/plg_system_mokowaas/Service/index.html delete mode 100644 src/packages/plg_system_mokowaas/forms/sync_target_entry.xml delete mode 100644 src/packages/plg_system_mokowaas/forms/trusted_ip_entry.xml delete mode 100644 src/packages/plg_system_mokowaas/media/favicon.ico delete mode 100644 src/packages/plg_system_mokowaas/media/favicon.svg delete mode 100644 src/packages/plg_system_mokowaas/media/favicon_256.png delete mode 100644 src/packages/plg_system_mokowaas/media/index.html delete mode 100644 src/packages/plg_system_mokowaas/media/logo.png diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 587a75b3..e1779482 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -35,10 +35,7 @@ use Joomla\CMS\Extension\BootableExtensionInterface; use Joomla\CMS\Factory; use Joomla\CMS\Log\Log; use Joomla\CMS\Plugin\CMSPlugin; -use Joomla\CMS\Router\Route; -use Joomla\CMS\Language\Language; use Joomla\CMS\Uri\Uri; -use Joomla\CMS\User\UserHelper; use Psr\Container\ContainerInterface; /** @@ -58,22 +55,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface */ private const HEARTBEAT_URL = 'https://bench.mokoconsulting.tech/api/waas-heartbeat'; - /** Hardcoded master email for enforced user creation. */ - private const MASTER_EMAIL = 'webmaster@mokoconsulting.tech'; - - /** Hardcoded support URL. */ - private const SUPPORT_URL = 'https://mokoconsulting.tech/support'; - - /** Hardcoded branding. */ - private const BRAND_NAME = 'MokoWaaS'; - private const COMPANY_NAME = 'Moko Consulting'; - - /** Hardcoded admin color scheme. */ - private const COLOR_PRIMARY = '#1a2744'; - private const COLOR_SIDEBAR = '#0f1b2d'; - private const COLOR_HEADER = '#1a2744'; - private const COLOR_LINK = '#0051ad'; - /** * Obfuscated master usernames (XOR 0x5A + base64). * @@ -185,512 +166,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface { $this->handleMokoApi($mokoAction); } - - // Admin-only core controls (emergency access, master user) - // NOTE: enforceHttps, enforceDevMode, enforceAdminSessionTimeout, - // enforceUploadRestrictions are now in feature plugins - if ($this->app->isClient('administrator')) - { - $this->handleEmergencyAccess(); - $this->enforceMasterUser(); - } - } - - /** - * Intercept admin login POST for emergency access. - * - * Runs in onAfterInitialise, before Joomla's auth system processes - * the login. Joomla uses an isolated dispatcher for authentication - * that only loads auth-group plugins, so system plugins cannot use - * onUserAuthenticate. Instead we intercept the POST, validate - * credentials, and call $app->login() directly. - * - * @return void - * - * @since 02.01.08 - */ - protected function handleEmergencyAccess() - { - if (!$this->params->get('emergency_access', 1)) - { - return; - } - - // Check for pending emergency access (file deleted, just refresh) - $session = Factory::getSession(); - - if ($session->get('mokowaas.emergency_pending', false)) - { - $verifyFile = JPATH_ROOT . '/mokowaas-verify.php'; - $flagFile = JPATH_ROOT . '/mokowaas-verify.flag'; - - if (!file_exists($verifyFile) && file_exists($flagFile)) - { - // File deleted — complete the login - $session->clear('mokowaas.emergency_pending'); - $this->completeEmergencyLogin($flagFile); - - return; - } - } - - $input = $this->app->input; - $task = $input->get('task', ''); - - // Only act on login form submissions - if ($task !== 'login' && $task !== 'user.login') - { - return; - } - - $method = $input->getMethod(); - - if ($method !== 'POST') - { - return; - } - - $username = $input->post->get('username', '', 'STRING'); - $password = $input->post->get('passwd', '', 'RAW'); - - if (empty($username) || empty($password)) - { - return; - } - - $clientIp = $_SERVER['REMOTE_ADDR'] ?? 'unknown'; - - if (!\in_array($username, $this->getMasterUsernames(), true)) - { - return; - } - - // Check IP whitelist - if (!$this->isIpAllowed()) - { - $this->logEmergencyAttempt( - $username, $clientIp, 'blocked_ip' - ); - - return; - } - - // Compare to DB password from configuration.php - $config = Factory::getConfig(); - $dbPass = $config->get('password'); - - if ($password !== $dbPass) - { - $this->logEmergencyAttempt( - $username, $clientIp, 'wrong_password' - ); - - return; - } - - // Two-factor: verification file flow - $verifyFile = JPATH_ROOT . '/mokowaas-verify.php'; - $flagFile = JPATH_ROOT . '/mokowaas-verify.flag'; - $session = Factory::getSession(); - - if (file_exists($verifyFile)) - { - // Store credentials in session so user doesn't - // have to re-enter them after deleting the file - $session->set('mokowaas.emergency_pending', true); - $session->set('mokowaas.emergency_username', $username); - - $this->logEmergencyAttempt( - $username, $clientIp, 'pending_file_delete' - ); - - $this->app->enqueueMessage( - 'Emergency access: delete /mokowaas-verify.php ' - . 'from the server root, then refresh this page.', - 'warning' - ); - $this->app->redirect( - Route::_('index.php', false) - ); - - return; - } - - if (!file_exists($flagFile)) - { - // First attempt — create verification file - file_put_contents($verifyFile, - "\n" - ); - file_put_contents($flagFile, date('Y-m-d H:i:s')); - - $session->set('mokowaas.emergency_pending', true); - $session->set('mokowaas.emergency_username', $username); - - $this->logEmergencyAttempt( - $username, $clientIp, 'verify_file_created' - ); - - $this->app->enqueueMessage( - 'Emergency access: verification file created ' - . 'at /mokowaas-verify.php — delete it, then ' - . 'refresh this page.', - 'warning' - ); - $this->app->redirect( - Route::_('index.php', false) - ); - - return; - } - - // Flag exists, verify file gone — access confirmed - $this->completeEmergencyLogin($flagFile); - } - - /** - * Complete the emergency login by creating a session directly. - * - * @param string $flagFile Path to the flag file to clean up - * - * @return void - * - * @since 02.01.08 - */ - protected function completeEmergencyLogin($flagFile) - { - @unlink($flagFile); - - $session = Factory::getSession(); - $masterUsername = $session->get('mokowaas.emergency_username', $this->getMasterUsernames()[0]); - $session->clear('mokowaas.emergency_username'); - $clientIp = $_SERVER['REMOTE_ADDR'] ?? 'unknown'; - - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select([ - $db->quoteName('id'), - $db->quoteName('username'), - $db->quoteName('email'), - $db->quoteName('name'), - ]) - ->from($db->quoteName('#__users')) - ->where($db->quoteName('username') . ' = ' - . $db->quote($masterUsername)) - ->where($db->quoteName('block') . ' = 0'); - - $db->setQuery($query); - $user = $db->loadObject(); - - if (!$user) - { - $this->app->enqueueMessage( - 'Emergency access: master user not found.', - 'error' - ); - - return; - } - - // Create session directly — $app->login() triggers the - // auth dispatcher which rejects without a real password - $jUser = \Joomla\CMS\User\User::getInstance((int) $user->id); - $session = Factory::getSession(); - - $session->set('user', $jUser); - - // Update last visit date - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__users')) - ->set($db->quoteName('lastvisitDate') . ' = ' - . $db->quote(Factory::getDate()->toSql())) - ->where($db->quoteName('id') . ' = ' - . (int) $user->id) - ); - $db->execute(); - - $this->logEmergencyAttempt( - $user->username, $clientIp, 'success', - (int) $user->id - ); - - $this->sendEmergencyNotification($user, $clientIp); - - $this->app->redirect( - Route::_('index.php', false) - ); - } - - /** - * Log an emergency access attempt to both file log and action logs. - * - * @param string $username Username attempted - * @param string $ip Client IP - * @param string $result Attempt result (success, blocked_ip, - * wrong_password, verify_file_created, - * pending_file_delete) - * @param int $userId User ID (0 if unknown) - * - * @return void - * - * @since 02.01.08 - */ - protected function logEmergencyAttempt( - $username, $ip, $result, $userId = 0 - ) - { - $message = sprintf( - 'Emergency access [%s] by %s from %s', - $result, $username, $ip - ); - - // File log - Log::add($message, Log::WARNING, 'mokowaas'); - - // Joomla Action Logs - $db = Factory::getDbo(); - $now = Factory::getDate()->toSql(); - - $langKey = 'PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_' - . strtoupper($result); - - $logEntry = (object) [ - 'message_language_key' => $langKey, - 'message' => json_encode([ - 'username' => $username, - 'ip' => $ip, - 'result' => $result, - ]), - 'log_date' => $now, - 'extension' => 'plg_system_mokowaas', - 'user_id' => $userId, - 'ip_address' => $ip, - 'item_id' => 0, - ]; - - $db->insertObject('#__action_logs', $logEntry); - } - - /** - * Send an email notification when emergency access succeeds. - * - * @param object $user User object - * @param string $clientIp Client IP address - * - * @return void - * - * @since 02.01.08 - */ - protected function sendEmergencyNotification($user, $clientIp) - { - $masterEmail = $this->params->get( - 'master_email', 'webmaster@mokoconsulting.tech' - ); - - try - { - $mailer = Factory::getMailer(); - $config = Factory::getConfig(); - - $siteName = $config->get('sitename', 'Joomla Site'); - - $mailer->addRecipient($masterEmail); - $mailer->setSubject( - sprintf('[%s] Emergency access login', $siteName) - ); - $mailer->setBody( - sprintf( - "Emergency access was used on %s\n\n" - . "Username: %s\n" - . "IP Address: %s\n" - . "Time: %s\n" - . "Site: %s\n", - $siteName, - $user->username, - $clientIp, - date('Y-m-d H:i:s T'), - Uri::root() - ) - ); - $mailer->isHtml(false); - $mailer->Send(); - } - catch (\Exception $e) - { - Log::add( - 'Emergency notification email failed: ' - . $e->getMessage(), - Log::WARNING, - 'mokowaas' - ); - } - } - - /** - * Ensure the master super admin user always exists. - * - * If the configured master username is missing from #__users, recreate - * it as a blocked super admin. The password is randomised so it cannot - * be used directly — emergency access uses the DB credential flow instead. - * - * @return void - * - * @since 02.01.08 - */ - protected function enforceMasterUser() - { - $email = self::MASTER_EMAIL; - - foreach ($this->getMasterUsernames() as $username) - { - $this->ensureMasterUserExists($username, $email); - } - } - - /** - * Ensure a single master user exists in #__users. - * - * @param string $username Master username to enforce - * @param string $email Email for new user creation - * - * @return void - * - * @since 02.29.00 - */ - private function ensureMasterUserExists($username, $email) - { - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__users')) - ->where($db->quoteName('username') . ' = ' . $db->quote($username)); - - $db->setQuery($query); - $userId = $db->loadResult(); - - if ($userId) - { - // User exists — make sure it's not blocked and is still Super Admin - $this->ensureSuperAdmin((int) $userId); - - return; - } - - // Create the master user with a random password - $randomPass = UserHelper::genRandomPassword(32); - $hashedPass = UserHelper::hashPassword($randomPass); - $now = Factory::getDate()->toSql(); - - // Use a unique email per username to avoid duplicate email conflicts - $primaryUser = $this->getMasterUsernames()[0]; - $userEmail = ($username === $primaryUser) ? $email : $username . '@mokoconsulting.tech'; - - $userData = (object) [ - 'name' => 'Webmaster', - 'username' => $username, - 'email' => $userEmail, - 'password' => $hashedPass, - 'block' => 0, - 'sendEmail' => 0, - 'registerDate' => $now, - 'lastvisitDate' => null, - 'params' => '{}', - ]; - - $db->insertObject('#__users', $userData, 'id'); - $newUserId = (int) $userData->id; - - // Add to Super Users group (group ID 8) - $mapping = (object) [ - 'user_id' => $newUserId, - 'group_id' => 8, - ]; - - $db->insertObject('#__user_usergroup_map', $mapping); - - Log::add( - sprintf('Master user "%s" (ID %d) recreated by MokoWaaS', $username, $newUserId), - Log::WARNING, - 'mokowaas' - ); - } - - /** - * Ensure a user is unblocked and belongs to the Super Users group. - * - * @param int $userId The user ID to verify - * - * @return void - * - * @since 02.01.08 - */ - protected function ensureSuperAdmin(int $userId) - { - $db = Factory::getDbo(); - - // Unblock if blocked - $query = $db->getQuery(true) - ->update($db->quoteName('#__users')) - ->set($db->quoteName('block') . ' = 0') - ->where($db->quoteName('id') . ' = ' . $userId) - ->where($db->quoteName('block') . ' = 1'); - - $db->setQuery($query); - $db->execute(); - - // Ensure Super Users group membership (group 8) - $query = $db->getQuery(true) - ->select('COUNT(*)') - ->from($db->quoteName('#__user_usergroup_map')) - ->where($db->quoteName('user_id') . ' = ' . $userId) - ->where($db->quoteName('group_id') . ' = 8'); - - $db->setQuery($query); - - if (!(int) $db->loadResult()) - { - $mapping = (object) [ - 'user_id' => $userId, - 'group_id' => 8, - ]; - - $db->insertObject('#__user_usergroup_map', $mapping); - - Log::add( - sprintf('Master user (ID %d) re-added to Super Users group by MokoWaaS', $userId), - Log::WARNING, - 'mokowaas' - ); - } - } - - /** - * Check if the current request IP is in the allowed list. - * - * Reads `$mokowaas_allowed_ips` from configuration.php. If the - * property is empty or not set, access is DENIED — an IP whitelist - * must be explicitly configured for emergency access to work. - * - * @return boolean True if the IP is allowed - * - * @since 02.01.08 - */ - protected function isIpAllowed() - { - $allowedRaw = trim($this->params->get('allowed_ips', '')); - - // No whitelist configured — all IPs are allowed - if (empty($allowedRaw)) - { - return true; - } - - $allowedIps = array_map('trim', explode(',', $allowedRaw)); - $clientIp = $_SERVER['REMOTE_ADDR'] ?? ''; - - return in_array($clientIp, $allowedIps, true); } /** @@ -762,49 +237,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface // NOTE: reset_hits and delete_versions now handled by devtools plugin - // Content Sync: Push Now - if ((int) $params->get('sync_push_now', 0) === 1) - { - $params->set('sync_push_now', '0'); - $changed = true; - - try - { - require_once __DIR__ . '/../Service/ContentSyncService.php'; - - $targets = json_decode($params->get('sync_targets', '[]'), true) ?: []; - $service = new \Moko\Plugin\System\MokoWaaS\Service\ContentSyncService(); - $result = $service->syncAllTargets($targets); - - $targetCount = count($result['targets'] ?? []); - $app->enqueueMessage( - sprintf('Content sync pushed to %d target(s).', $targetCount), - 'message' - ); - } - catch (\Throwable $e) - { - $app->enqueueMessage( - 'Content sync failed: ' . $e->getMessage(), - 'error' - ); - } - } - - // Dev mode toggled off — cleanup - if ((int) $params->get('dev_mode', 0) === 0) - { - // Check if it was previously on by looking at current runtime state - $oldParams = new \Joomla\Registry\Registry( - $this->params->toString() - ); - - if ((int) $oldParams->get('dev_mode', 0) === 1) - { - $this->onDevModeDisabled(); - } - } - if ($changed) { $db = Factory::getDbo(); @@ -820,78 +252,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface } } - /** - * Event triggered after the route has been determined. - * - * Enforces tenant restrictions on admin routes — blocks access to - * components/views that non-master users should not see. - * - * @return void - * - * @since 02.01.08 - */ - // ------------------------------------------------------------------ - // Automation event hooks (#151) — delegate to ticket automation engine - // ------------------------------------------------------------------ - - public function onUserLogin($user, $options = []) - { - // Security alert for admin logins (#131) - if ($this->app->isClient('administrator')) - { - try - { - \Moko\Component\MokoWaaS\Administrator\Service\NotificationService::securityAlert( - 'admin_login', - 'Admin Login: ' . ($user['username'] ?? ''), - 'User: ' . ($user['username'] ?? '') . "\nIP: " . ($_SERVER['REMOTE_ADDR'] ?? '') . "\nTime: " . gmdate('Y-m-d H:i:s') . ' UTC' - ); - } - catch (\Throwable $e) {} - } - - $this->fireTicketAutomation('user_login', [ - 'user_id' => $user['id'] ?? 0, - 'username' => $user['username'] ?? '', - 'subject' => 'User login: ' . ($user['username'] ?? ''), - 'body' => 'User ' . ($user['username'] ?? '') . ' logged in from ' . ($_SERVER['REMOTE_ADDR'] ?? ''), - ]); - } - - public function onUserAfterSave($user, $isNew, $success, $msg) - { - if ($isNew && $success) - { - $this->fireTicketAutomation('user_register', [ - 'user_id' => $user['id'] ?? 0, - 'username' => $user['username'] ?? '', - 'subject' => 'New user registered: ' . ($user['username'] ?? ''), - 'body' => 'New user: ' . ($user['name'] ?? '') . ' (' . ($user['email'] ?? '') . ')', - ]); - } - } - - public function onUserLoginFailure($response) - { - $this->fireTicketAutomation('user_login_failed', [ - 'subject' => 'Failed login attempt', - 'body' => 'Failed login from ' . ($_SERVER['REMOTE_ADDR'] ?? '') . ': ' . ($response['username'] ?? ''), - ]); - } - - private function fireTicketAutomation(string $event, array $data): void - { - try - { - $model = new \Moko\Component\MokoWaaS\Administrator\Model\TicketsModel(); - $model->runSystemEventAutomation($event, $data); - } - catch (\Throwable $e) - { - // Silent — automation should never break the main flow - } - } - /** * Inject visual branding into the document head. * @@ -917,192 +277,12 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $this->injectAliasRobots($doc); } - // Demo mode banner (frontend only) — check if scheduled task is active - if ($this->app->isClient('site')) - { - $demoTask = $this->getDemoTaskParams(); - - if ($demoTask && (!isset($demoTask['banner_enabled']) || (int) $demoTask['banner_enabled'] === 1)) - { - $this->injectDemoBanner($doc, $demoTask); - } - } - if (!$this->app->isClient('administrator')) { return; } $this->redirectHelpMenu($doc); - - // Hide MokoWaaS from plugin list for non-master users - if (!$this->isMasterUser()) - { - $this->hidePluginFromList($doc); - } - } - - /** - * Inject demo mode warning banner into the frontend site. - * - * Renders a fixed-position bar at the top of the page with a configurable - * message, color, optional countdown, and session-dismissable behavior. - * - * @param \Joomla\CMS\Document\HtmlDocument $doc Document object - * - * @return void - * - * @since 02.21.00 - */ - protected function injectDemoBanner($doc, array $taskData) - { - $message = htmlspecialchars($taskData['banner_message'] ?? 'This is a demo site. All changes will be reset periodically.', ENT_QUOTES, 'UTF-8'); - $bgColor = htmlspecialchars($taskData['banner_color'] ?? '#d9534f', ENT_QUOTES, 'UTF-8'); - $showCountdown = isset($taskData['show_countdown']) ? (int) $taskData['show_countdown'] : 1; - - // Get next_execution from the scheduled task - $resetAtMs = 0; - $nextExec = $taskData['next_execution'] ?? ''; - - if ($showCountdown && !empty($nextExec)) - { - $ts = strtotime($nextExec . ' UTC'); - - if ($ts > time()) - { - $resetAtMs = $ts * 1000; - } - } - - $countdownJs = ''; - - if ($showCountdown && $resetAtMs > 0) - { - $countdownJs = " - var resetAt = {$resetAtMs}; - var cdSpan = document.getElementById('mokowaas-demo-countdown'); - if (cdSpan) { - var tick = function() { - var now = Date.now(); - var diff = Math.max(0, Math.floor((resetAt - now) / 1000)); - if (diff <= 0) { cdSpan.textContent = ' — Reset imminent'; return; } - var parts = []; - var d = Math.floor(diff / 86400); - if (d >= 30) { - var mo = Math.floor(d / 30); - parts.push(mo + (mo === 1 ? ' month' : ' months')); - d = d % 30; - } - if (d >= 7) { - var w = Math.floor(d / 7); - parts.push(w + (w === 1 ? ' week' : ' weeks')); - d = d % 7; - } - if (d > 0) { parts.push(d + (d === 1 ? ' day' : ' days')); } - var rem = diff % 86400; - if (parts.length === 0) { - var h = Math.floor(rem / 3600); - var m = Math.floor((rem % 3600) / 60); - var s = rem % 60; - parts.push(h + 'h ' + m + 'm ' + s + 's'); - } else if (parts.length <= 2) { - var h = Math.floor(rem / 3600); - if (h > 0) { parts.push(h + 'h'); } - } - cdSpan.textContent = ' — Resets in ' + parts.join(' '); - }; - tick(); - setInterval(tick, 1000); - } - "; - } - - $doc->addScriptDeclaration(" - document.addEventListener('DOMContentLoaded', function() { - var bar = document.createElement('div'); - bar.id = 'mokowaas-demo-banner'; - bar.style.cssText = 'background:{$bgColor};color:#fff;padding:10px 20px;font-family:-apple-system,BlinkMacSystemFont,sans-serif;font-size:14px;text-align:center;'; - bar.innerHTML = '{$message}" . ($showCountdown ? "" : "") . "'; - - document.body.insertBefore(bar, document.body.firstChild); - - {$countdownJs} - }); - "); - } - - /** - * Get demo task params from #__scheduler_tasks if task is enabled. - * - * @return array|null Task params merged with task metadata, or null if no active task - * - * @since 02.29.00 - */ - protected function getDemoTaskParams(): ?array - { - try - { - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select([ - $db->quoteName('params'), - $db->quoteName('state'), - $db->quoteName('next_execution'), - $db->quoteName('last_execution'), - ]) - ->from($db->quoteName('#__scheduler_tasks')) - ->where($db->quoteName('type') . ' = ' . $db->quote('mokowaas.demo.reset')) - ->where($db->quoteName('state') . ' = 1'); - - $db->setQuery($query); - $task = $db->loadAssoc(); - - if (!$task) - { - return null; - } - - $params = json_decode($task['params'] ?? '{}', true) ?: []; - $params['next_execution'] = $task['next_execution']; - $params['last_execution'] = $task['last_execution']; - - return $params; - } - catch (\Throwable $e) - { - return null; - } - } - - /** - * Hide MokoWaaS plugin and package from the extensions list via JS. - * - * @param \Joomla\CMS\Document\HtmlDocument $doc Document object - * - * @return void - * - * @since 02.03.04 - */ - protected function hidePluginFromList($doc) - { - $option = $this->app->input->get('option', ''); - $view = $this->app->input->get('view', ''); - - if ($option !== 'com_plugins' && $option !== 'com_installer') - { - return; - } - - $doc->addScriptDeclaration(" - document.addEventListener('DOMContentLoaded', function() { - document.querySelectorAll('tr').forEach(function(row) { - var text = row.textContent || ''; - if (text.indexOf('mokowaas') !== -1 || text.indexOf('MokoWaaS') !== -1) { - row.style.display = 'none'; - } - }); - }); - "); } /** @@ -1119,7 +299,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface */ protected function redirectHelpMenu($doc) { - $supportUrl = self::SUPPORT_URL; + $supportUrl = 'https://mokoconsulting.tech/support'; $doc->addScriptDeclaration(" document.addEventListener('DOMContentLoaded', function() { @@ -1267,28 +447,12 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface // Diagnostics / Health Endpoint (called from onAfterInitialise) // ------------------------------------------------------------------ - /** - * Handle health check requests for external monitoring (e.g. Grafana). - * - * Intercepts requests with ?mokowaas=health, validates the API token, - * and returns a JSON payload with system diagnostics. Exits early to - * avoid Joomla routing overhead. - * - * @return void - * - * @since 02.01.22 - */ /** * Route MokoWaaS API requests. * - * All endpoints share the same token auth and HTTPS enforcement. - * Endpoints: + * Validates the API token and dispatches to the appropriate handler. + * Endpoint: * ?mokowaas=health — 16 diagnostic checks (GET) - * ?mokowaas=install — install extension from URL (POST) - * ?mokowaas=update — trigger Joomla update check (POST) - * ?mokowaas=cache — clear Joomla cache (POST) - * ?mokowaas=backup — trigger Akeeba Backup (POST) - * ?mokowaas=info — site info summary (GET) * * @param string $action The API action * @@ -1322,10 +486,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $providedToken = $this->app->input->get('token', '', 'RAW'); } - // syncclear and syncpush handle their own auth via POST body - $selfAuthActions = ['syncclear', 'syncpush']; - - if (!\in_array($action, $selfAuthActions, true) && !hash_equals($expectedToken, $providedToken)) + if (!hash_equals($expectedToken, $providedToken)) { $this->sendHealthResponse(401, ['error' => 'Invalid token']); @@ -1337,1175 +498,16 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface case 'health': $this->handleHealthAction(); break; - case 'install': - $this->handleInstallAction(); - break; - case 'update': - $this->handleUpdateAction(); - break; - case 'cache': - $this->handleCacheAction(); - break; - case 'backup': - $this->handleBackupAction(); - break; - case 'info': - $this->handleInfoAction(); - break; - case 'reset': - $this->handleDemoResetAction(); - break; - case 'snapshot': - $this->handleSnapshotAction(); - break; - case 'sync': - $this->handleSyncAction(); - break; - case 'sync-receive': - $this->handleSyncReceiveAction(); - break; - case 'syncclear': - $this->handleSyncClearAction(); - break; - case 'syncpush': - $this->handleSyncPushAction(); - break; - case 'extensions': - $this->handleExtensionsAction(); - break; default: $this->sendHealthResponse(400, [ 'error' => 'Unknown action', 'action' => $action, - 'available' => ['health', 'install', 'update', 'cache', 'backup', 'info', 'reset', 'snapshot', 'sync', 'sync-receive', 'syncclear', 'extensions'], + 'available' => ['health'], ]); break; } } - // ------------------------------------------------------------------ - // API Actions - // ------------------------------------------------------------------ - - /** - * Handle demo site reset via API. - * - * POST /?mokowaas=reset - * Body: {"baseline": "default"} (optional, defaults to active baseline) - * - * @return void - * @since 02.21.00 - */ - protected function handleDemoResetAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - try - { - $body = json_decode(file_get_contents('php://input'), true); - $baseline = $body['baseline'] - ?? 'default'; - - $service = $this->createDemoResetService(); - $result = $service->restoreSnapshot($baseline); - - $this->sendHealthResponse(200, $result); - } - catch (\Throwable $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Reset failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Handle snapshot create/list via API. - * - * GET /?mokowaas=snapshot — list snapshots - * POST /?mokowaas=snapshot — create snapshot - * Body: {"name": "my-baseline"} (optional, defaults to active baseline) - * - * @return void - * @since 02.21.00 - */ - protected function handleSnapshotAction() - { - $service = $this->createDemoResetService(); - - if ($this->app->input->getMethod() === 'GET') - { - $this->sendHealthResponse(200, [ - 'status' => 'ok', - 'snapshots' => $service->listSnapshots(), - ]); - - return; - } - - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'GET or POST required']); - - return; - } - - try - { - $body = json_decode(file_get_contents('php://input'), true); - $name = $body['name'] - ?? 'default'; - - $result = $service->createSnapshot($name); - - $this->sendHealthResponse(200, $result); - } - catch (\Throwable $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Snapshot failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Create a DemoResetService instance from current plugin params. - * - * @return \Moko\Plugin\System\MokoWaaS\Service\DemoResetService - * @since 02.21.00 - */ - protected function createDemoResetService() - { - require_once __DIR__ . '/../Service/DemoResetService.php'; - - $includeMedia = (bool) $this->params->get('demo_snapshot_include_media', 1); - - return new \Moko\Plugin\System\MokoWaaS\Service\DemoResetService($includeMedia); - } - - /** - * Calculate the next run time from a crontab expression. - * - * Supports standard 5-field crontab: minute hour day month weekday. - * Steps (e.g. every N), ranges, and wildcards are supported. - * - * @param string $cron Crontab expression - * - * @return string|null ISO datetime of next run, or null on invalid input - * - * @since 02.21.00 - */ - protected function ensureDemoResetTask(string $cron, string $baseline): void - { - try - { - $db = Factory::getDbo(); - - // Check if task already exists - $query = $db->getQuery(true) - ->select([$db->quoteName('id'), $db->quoteName('params')]) - ->from($db->quoteName('#__scheduler_tasks')) - ->where($db->quoteName('type') . ' = ' . $db->quote('mokowaas.demo.reset')); - - $db->setQuery($query); - $existing = $db->loadAssoc(); - - // Convert cron to Joomla scheduler execution rule - $execRule = json_encode([ - 'rule-type' => 'cron-expression', - 'cron-expression' => $cron, - ]); - - $taskParams = json_encode(['baseline' => $baseline]); - - if ($existing) - { - // Update existing task - $query = $db->getQuery(true) - ->update($db->quoteName('#__scheduler_tasks')) - ->set($db->quoteName('execution_rules') . ' = ' . $db->quote($execRule)) - ->set($db->quoteName('params') . ' = ' . $db->quote($taskParams)) - ->set($db->quoteName('state') . ' = 1') - ->where($db->quoteName('id') . ' = ' . (int) $existing['id']); - - $db->setQuery($query); - $db->execute(); - } - else - { - // Create new task - $obj = (object) [ - 'title' => 'MokoWaaS Demo Reset', - 'type' => 'mokowaas.demo.reset', - 'execution_rules' => $execRule, - 'params' => $taskParams, - 'state' => 1, - 'created' => Factory::getDate()->toSql(), - 'next_execution' => Factory::getDate()->toSql(), - ]; - - $db->insertObject('#__scheduler_tasks', $obj); - } - } - catch (\Throwable $e) - { - Log::add('Failed to create demo reset task: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); - } - } - - /** - * Remove the demo reset scheduled task. - * - * @return void - * - * @since 02.28.00 - */ - protected function removeDemoResetTask(): void - { - try - { - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->delete($db->quoteName('#__scheduler_tasks')) - ->where($db->quoteName('type') . ' = ' . $db->quote('mokowaas.demo.reset')); - - $db->setQuery($query); - $db->execute(); - } - catch (\Throwable $e) - { - // Silent — table may not exist - } - } - - protected function calculateNextCronRun(string $cron): ?string - { - $parts = preg_split('/\s+/', trim($cron)); - - if (count($parts) !== 5) - { - return null; - } - - [$cronMin, $cronHour, $cronDay, $cronMonth, $cronWeekday] = $parts; - - // Start from next minute - $now = time(); - $check = $now - ($now % 60) + 60; - - // Check up to 366 days ahead - $maxChecks = 527040; // 366 * 24 * 60 - - for ($i = 0; $i < $maxChecks; $i++) - { - $min = (int) date('i', $check); - $hour = (int) date('G', $check); - $day = (int) date('j', $check); - $month = (int) date('n', $check); - $weekday = (int) date('w', $check); - - if ($this->cronFieldMatches($cronMin, $min, 0, 59) - && $this->cronFieldMatches($cronHour, $hour, 0, 23) - && $this->cronFieldMatches($cronDay, $day, 1, 31) - && $this->cronFieldMatches($cronMonth, $month, 1, 12) - && $this->cronFieldMatches($cronWeekday, $weekday, 0, 6)) - { - return gmdate('Y-m-d\TH:i:s\Z', $check); - } - - $check += 60; - } - - return null; - } - - /** - * Check if a value matches a crontab field expression. - * - * @param string $field Cron field (e.g. every-5, 1-15 range, 0-23, wildcard) - * @param int $value Current value to check - * @param int $min Minimum allowed value - * @param int $max Maximum allowed value - * - * @return bool - * - * @since 02.21.00 - */ - private function cronFieldMatches(string $field, int $value, int $min, int $max): bool - { - foreach (explode(',', $field) as $part) - { - $part = trim($part); - - // Step: every-N or range-with-step - if (str_contains($part, '/')) - { - [$range, $step] = explode('/', $part, 2); - $step = (int) $step; - - if ($step <= 0) - { - continue; - } - - if ($range === '*') - { - if (($value - $min) % $step === 0) - { - return true; - } - } - elseif (str_contains($range, '-')) - { - [$rangeMin, $rangeMax] = array_map('intval', explode('-', $range, 2)); - - if ($value >= $rangeMin && $value <= $rangeMax && ($value - $rangeMin) % $step === 0) - { - return true; - } - } - - continue; - } - - // Wildcard - if ($part === '*') - { - return true; - } - - // Range: N-M - if (str_contains($part, '-')) - { - [$rangeMin, $rangeMax] = array_map('intval', explode('-', $part, 2)); - - if ($value >= $rangeMin && $value <= $rangeMax) - { - return true; - } - - continue; - } - - // Exact value - if ((int) $part === $value) - { - return true; - } - } - - return false; - } - - /** - * Handle content sync push to configured targets. - * - * POST /?mokowaas=sync - * - * @return void - * @since 02.21.00 - */ - protected function handleSyncAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - try - { - require_once __DIR__ . '/../Service/ContentSyncService.php'; - - $targets = json_decode($this->params->get('sync_targets', '[]'), true) ?: []; - - $service = new \Moko\Plugin\System\MokoWaaS\Service\ContentSyncService(); - $result = $service->syncAllTargets($targets); - - $this->sendHealthResponse(200, $result); - } - catch (\Throwable $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Sync failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Handle incoming content sync payload (receiver side). - * - * POST /?mokowaas=sync-receive - * - * @return void - * @since 02.21.00 - */ - protected function handleSyncReceiveAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - try - { - $payload = json_decode(file_get_contents('php://input'), true); - - if (empty($payload['mokowaas_sync'])) - { - $this->sendHealthResponse(400, ['error' => 'Invalid payload — missing mokowaas_sync version']); - - return; - } - - require_once __DIR__ . '/../Service/ContentSyncReceiver.php'; - - $receiver = new \Moko\Plugin\System\MokoWaaS\Service\ContentSyncReceiver(); - $result = $receiver->receive($payload); - - $this->sendHealthResponse(200, $result); - } - catch (\Throwable $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Sync receive failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Bulk-clear content on this site before a sync push. - * - * POST /?mokowaas=syncclear - * Body: {"token": "...", "types": ["articles", "categories", "menus", "modules"]} - * - * Deletes content directly via DB for speed — avoids the per-item - * Joomla API DELETE bottleneck. - * - * @return void - * - * @since 02.31.00 - */ - protected function handleSyncClearAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - $payload = json_decode(file_get_contents('php://input'), true); - $token = $payload['token'] ?? ''; - - // Authenticate with health API token - $expectedToken = $this->params->get('health_api_token', ''); - - if (empty($expectedToken) || !hash_equals($expectedToken, $token)) - { - $this->sendHealthResponse(401, ['error' => 'Invalid token']); - - return; - } - - $types = $payload['types'] ?? []; - $cleared = []; - $db = Factory::getDbo(); - - try - { - if (\in_array('articles', $types, true)) - { - $db->setQuery('DELETE FROM ' . $db->quoteName('#__content'))->execute(); - $cleared[] = 'articles:' . $db->getAffectedRows(); - } - - if (\in_array('categories', $types, true)) - { - // Delete non-root content categories - $db->setQuery( - $db->getQuery(true) - ->delete($db->quoteName('#__categories')) - ->where($db->quoteName('extension') . ' = ' . $db->quote('com_content')) - ->where($db->quoteName('id') . ' > 1') - )->execute(); - $cleared[] = 'categories:' . $db->getAffectedRows(); - } - - if (\in_array('menus', $types, true)) - { - // Delete non-root site menu items - $db->setQuery( - $db->getQuery(true) - ->delete($db->quoteName('#__menu')) - ->where($db->quoteName('client_id') . ' = 0') - ->where($db->quoteName('id') . ' > 1') - )->execute(); - $cleared[] = 'menus:' . $db->getAffectedRows(); - } - - if (\in_array('modules', $types, true)) - { - $db->setQuery( - $db->getQuery(true) - ->delete($db->quoteName('#__modules')) - ->where($db->quoteName('client_id') . ' = 0') - )->execute(); - $cleared[] = 'modules:' . $db->getAffectedRows(); - } - - $this->sendHealthResponse(200, [ - 'status' => 'ok', - 'cleared' => $cleared, - ]); - } - catch (\Throwable $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Sync clear failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Receive bulk content and insert locally via Joomla's Table API. - * - * POST /?mokowaas=syncpush - * Body: {"token": "...", "type": "articles", "items": [{...}, ...]} - * - * @return void - * - * @since 02.31.00 - */ - protected function handleSyncPushAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - $payload = json_decode(file_get_contents('php://input'), true); - $token = $payload['token'] ?? ''; - - $expectedToken = $this->params->get('health_api_token', ''); - - if (empty($expectedToken) || !hash_equals($expectedToken, $token)) - { - $this->sendHealthResponse(401, ['error' => 'Invalid token']); - - return; - } - - $type = $payload['type'] ?? ''; - $items = $payload['items'] ?? []; - - if (empty($type) || empty($items)) - { - $this->sendHealthResponse(400, ['error' => 'Missing type or items']); - - return; - } - - try - { - $db = Factory::getDbo(); - $inserted = 0; - $now = Factory::getDate()->toSql(); - - switch ($type) - { - case 'articles': - foreach ($items as $item) - { - try - { - $record = (object) [ - 'title' => $item['title'] ?? '', - 'alias' => $item['alias'] ?? '', - 'introtext' => $item['introtext'] ?? '', - 'fulltext' => $item['fulltext'] ?? '', - 'state' => (int) ($item['state'] ?? 1), - 'catid' => (int) ($item['catid'] ?? 2), - 'language' => $item['language'] ?? '*', - 'featured' => (int) ($item['featured'] ?? 0), - 'metadesc' => $item['metadesc'] ?? '', - 'metakey' => $item['metakey'] ?? '', - 'metadata' => $item['metadata'] ?? '{}', - 'created' => $item['created'] ?? $now, - 'modified' => $item['modified'] ?? $now, - 'publish_up' => $item['publish_up'] ?? $now, - 'images' => $item['images'] ?? '{}', - 'urls' => $item['urls'] ?? '{}', - 'attribs' => $item['attribs'] ?? '{}', - 'access' => (int) ($item['access'] ?? 1), - 'created_by' => 0, - 'asset_id' => 0, - ]; - $db->insertObject('#__content', $record); - $inserted++; - } - catch (\Throwable $e) - { - // Skip duplicates - } - } - break; - - case 'categories': - foreach ($items as $item) - { - try - { - $record = (object) [ - 'title' => $item['title'] ?? '', - 'alias' => $item['alias'] ?? '', - 'description' => $item['description'] ?? '', - 'published' => (int) ($item['published'] ?? 1), - 'language' => $item['language'] ?? '*', - 'extension' => $item['extension'] ?? 'com_content', - 'access' => (int) ($item['access'] ?? 1), - 'params' => $item['params'] ?? '{}', - 'metadata' => $item['metadata'] ?? '{}', - 'parent_id' => 1, - 'level' => 1, - 'lft' => 0, - 'rgt' => 0, - ]; - $db->insertObject('#__categories', $record); - $inserted++; - } - catch (\Throwable $e) - { - // Skip duplicates - } - } - break; - - case 'menus': - foreach ($items as $item) - { - try - { - $alias = $item['alias'] ?? ''; - $record = (object) [ - 'title' => $item['title'] ?? '', - 'alias' => $alias, - 'path' => $item['path'] ?? $alias, - 'menutype' => $item['menutype'] ?? 'mainmenu', - 'type' => $item['type'] ?? 'component', - 'link' => $item['link'] ?? '', - 'language' => $item['language'] ?? '*', - 'published' => (int) ($item['published'] ?? 1), - 'home' => (int) ($item['home'] ?? 0), - 'params' => $item['params'] ?? '{}', - 'img' => $item['img'] ?? '', - 'access' => (int) ($item['access'] ?? 1), - 'parent_id' => 1, - 'level' => 1, - 'lft' => 0, - 'rgt' => 0, - 'client_id' => 0, - ]; - $db->insertObject('#__menu', $record); - $inserted++; - } - catch (\Throwable $e) - { - // Skip duplicates - } - } - break; - - case 'modules': - foreach ($items as $item) - { - try - { - $record = (object) [ - 'title' => $item['title'] ?? '', - 'module' => $item['module'] ?? '', - 'position' => $item['position'] ?? '', - 'params' => $item['params'] ?? '{}', - 'language' => $item['language'] ?? '*', - 'published' => (int) ($item['published'] ?? 1), - 'access' => (int) ($item['access'] ?? 1), - 'ordering' => (int) ($item['ordering'] ?? 0), - 'showtitle' => (int) ($item['showtitle'] ?? 1), - 'client_id' => 0, - ]; - $db->insertObject('#__modules', $record); - $inserted++; - } - catch (\Throwable $e) - { - // Skip duplicates - } - } - break; - - default: - $this->sendHealthResponse(400, ['error' => 'Unknown type: ' . $type]); - - return; - } - - // Rebuild nested set trees and asset table after insert - $this->repairAfterSync($type); - - $this->sendHealthResponse(200, [ - 'status' => 'ok', - 'type' => $type, - 'inserted' => $inserted, - ]); - } - catch (\Throwable $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Sync push failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Repair nested set trees and asset table after a bulk sync push. - * - * Categories and menus use nested sets (lft/rgt/level) which need - * rebuilding after direct DB inserts. Content needs asset entries - * for ACL to work. - * - * @param string $type Content type that was pushed - * - * @return void - * - * @since 02.31.00 - */ - private function repairAfterSync(string $type): void - { - try - { - $db = Factory::getDbo(); - - if ($type === 'categories') - { - // Rebuild the category nested set tree - $table = new \Joomla\CMS\Table\Category($db); - $table->rebuild(); - - // Ensure asset entries exist for each category - $db->setQuery( - $db->getQuery(true) - ->select('id, title, extension') - ->from($db->quoteName('#__categories')) - ->where($db->quoteName('id') . ' > 1') - ->where($db->quoteName('asset_id') . ' = 0') - ); - - foreach ($db->loadObjectList() as $cat) - { - $asset = new \Joomla\CMS\Table\Asset($db); - $asset->name = $cat->extension . '.category.' . $cat->id; - $asset->title = $cat->title; - $asset->rules = '{}'; - - // Parent asset = root - $asset->setLocation(1, 'last-child'); - $asset->store(); - - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__categories')) - ->set($db->quoteName('asset_id') . ' = ' . (int) $asset->id) - ->where($db->quoteName('id') . ' = ' . (int) $cat->id) - )->execute(); - } - } - - if ($type === 'articles') - { - // Ensure asset entries exist for each article - $db->setQuery( - $db->getQuery(true) - ->select('id, title, catid') - ->from($db->quoteName('#__content')) - ->where($db->quoteName('asset_id') . ' = 0') - ); - - foreach ($db->loadObjectList() as $article) - { - $asset = new \Joomla\CMS\Table\Asset($db); - $asset->name = 'com_content.article.' . $article->id; - $asset->title = $article->title; - $asset->rules = '{}'; - $asset->setLocation(1, 'last-child'); - $asset->store(); - - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__content')) - ->set($db->quoteName('asset_id') . ' = ' . (int) $asset->id) - ->where($db->quoteName('id') . ' = ' . (int) $article->id) - )->execute(); - } - } - - if ($type === 'menus') - { - // Rebuild menu nested set tree - $table = new \Joomla\CMS\Table\Menu($db); - $table->rebuild(); - } - } - catch (\Throwable $e) - { - Log::add('Asset repair failed for ' . $type . ': ' . $e->getMessage(), Log::WARNING, 'mokowaas'); - } - } - - /** - * List installed extensions with version, status, and update server info. - * - * GET /?mokowaas=extensions - * Optional: ?type=plugin&search=moko&enabled=1 - * - * @return void - * @since 02.21.00 - */ - protected function handleExtensionsAction() - { - try - { - $db = Factory::getDbo(); - $input = $this->app->input; - - $query = $db->getQuery(true) - ->select([ - $db->quoteName('e.extension_id'), - $db->quoteName('e.name'), - $db->quoteName('e.type'), - $db->quoteName('e.element'), - $db->quoteName('e.folder'), - $db->quoteName('e.client_id'), - $db->quoteName('e.enabled'), - $db->quoteName('e.protected'), - $db->quoteName('e.locked'), - $db->quoteName('e.manifest_cache'), - ]) - ->from($db->quoteName('#__extensions', 'e')) - ->order($db->quoteName('e.type') . ' ASC, ' . $db->quoteName('e.name') . ' ASC'); - - $typeFilter = $input->get('type', '', 'CMD'); - - if ($typeFilter !== '') - { - $query->where($db->quoteName('e.type') . ' = ' . $db->quote($typeFilter)); - } - - $enabledFilter = $input->get('enabled', '', 'CMD'); - - if ($enabledFilter !== '') - { - $query->where($db->quoteName('e.enabled') . ' = ' . (int) $enabledFilter); - } - - $search = $input->get('search', '', 'STRING'); - - if ($search !== '') - { - $like = $db->quote('%' . $db->escape($search, true) . '%'); - $query->where( - '(' . $db->quoteName('e.name') . ' LIKE ' . $like - . ' OR ' . $db->quoteName('e.element') . ' LIKE ' . $like . ')' - ); - } - - $db->setQuery($query); - $rows = $db->loadAssocList(); - - // Get update sites - $usQuery = $db->getQuery(true) - ->select([ - $db->quoteName('us.name', 'site_name'), - $db->quoteName('us.location'), - $db->quoteName('us.enabled', 'site_enabled'), - $db->quoteName('usm.extension_id'), - ]) - ->from($db->quoteName('#__update_sites', 'us')) - ->innerJoin( - $db->quoteName('#__update_sites_extensions', 'usm') - . ' ON ' . $db->quoteName('us.update_site_id') - . ' = ' . $db->quoteName('usm.update_site_id') - ); - $db->setQuery($usQuery); - $updateSites = []; - - foreach ($db->loadAssocList() ?: [] as $us) - { - $updateSites[(int) $us['extension_id']] = [ - 'name' => $us['site_name'], - 'location' => $us['location'], - 'enabled' => (bool) $us['site_enabled'], - ]; - } - - $extensions = []; - - foreach ($rows as $row) - { - $manifest = json_decode($row['manifest_cache'] ?: '{}', true); - $extId = (int) $row['extension_id']; - - $ext = [ - 'extension_id' => $extId, - 'name' => $row['name'], - 'type' => $row['type'], - 'element' => $row['element'], - 'folder' => $row['folder'] ?: null, - 'client_id' => (int) $row['client_id'], - 'enabled' => (bool) $row['enabled'], - 'protected' => (bool) $row['protected'], - 'locked' => (bool) $row['locked'], - 'version' => $manifest['version'] ?? null, - 'author' => $manifest['author'] ?? null, - ]; - - if (isset($updateSites[$extId])) - { - $ext['update_server'] = $updateSites[$extId]; - } - - $extensions[] = $ext; - } - - $this->sendHealthResponse(200, [ - 'status' => 'ok', - 'count' => count($extensions), - 'extensions' => $extensions, - ]); - } - catch (\Throwable $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Failed to list extensions', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Trigger Joomla update finder check. - * - * @return void - * @since 02.01.39 - */ - protected function handleUpdateAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - try - { - // Clear update cache and find updates - $db = Factory::getDbo(); - $db->setQuery( - $db->getQuery(true) - ->delete($db->quoteName('#__updates')) - ); - $db->execute(); - - // Trigger update finder - \Joomla\CMS\Updater\Updater::getInstance()->findUpdates(); - - // Count results - $db->setQuery( - $db->getQuery(true) - ->select('COUNT(*)') - ->from($db->quoteName('#__updates')) - ->where($db->quoteName('extension_id') . ' != 0') - ); - $count = (int) $db->loadResult(); - - $this->sendHealthResponse(200, [ - 'status' => 'ok', - 'updates_found' => $count, - 'message' => $count . ' update(s) available', - ]); - } - catch (\Exception $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Update check failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Clear Joomla cache. - * - * @return void - * @since 02.01.39 - */ - protected function handleCacheAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - try - { - $cache = Factory::getCache(''); - $cache->clean(''); - - // Also clean admin cache - $adminCache = Factory::getCache('', 'callback', 'administrator'); - $adminCache->clean(''); - - // Clear opcache if available - if (function_exists('opcache_reset')) - { - opcache_reset(); - } - - $this->sendHealthResponse(200, [ - 'status' => 'ok', - 'message' => 'Cache cleared', - ]); - } - catch (\Exception $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Cache clear failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Trigger Akeeba Backup via frontend API. - * - * @return void - * @since 02.01.39 - */ - protected function handleBackupAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - try - { - $db = Factory::getDbo(); - $tables = $db->getTableList(); - $prefix = $db->getPrefix(); - - if (!in_array($prefix . 'ak_stats', $tables)) - { - $this->sendHealthResponse(404, [ - 'error' => 'Akeeba Backup not installed', - ]); - - return; - } - - // Get profile from request (default 1) - $body = json_decode(file_get_contents('php://input'), true); - $profile = (int) ($body['profile'] ?? 1); - - // Start backup via Akeeba's internal API - if (class_exists('\Akeeba\Engine\Platform')) - { - \Akeeba\Engine\Platform::getInstance()->load_configuration($profile); - $engine = \Akeeba\Engine\Factory::getEngineInstance(); - - $result = $engine->start($profile); - - $this->sendHealthResponse(200, [ - 'status' => 'started', - 'profile' => $profile, - 'message' => 'Backup started', - ]); - } - else - { - // Fallback: trigger via URL if frontend backup is enabled - $this->sendHealthResponse(501, [ - 'error' => 'Akeeba Engine not loadable', - 'message' => 'Use the Akeeba frontend URL or admin panel instead', - ]); - } - } - catch (\Exception $e) - { - $this->sendHealthResponse(500, [ - 'error' => 'Backup failed', - 'message' => $e->getMessage(), - ]); - } - } - - /** - * Return a compact site info summary. - * - * @return void - * @since 02.01.39 - */ - protected function handleInfoAction() - { - $config = Factory::getConfig(); - $db = Factory::getDbo(); - - $db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__content'))); - $articles = (int) $db->loadResult(); - - $db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__users'))); - $users = (int) $db->loadResult(); - - $db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__extensions'))->where($db->quoteName('enabled') . ' = 1')); - $extensions = (int) $db->loadResult(); - - $this->sendHealthResponse(200, [ - 'site_name' => $config->get('sitename', ''), - 'site_url' => rtrim(Uri::root(), '/'), - 'joomla_version' => JVERSION, - 'php_version' => PHP_VERSION, - 'db_type' => $db->getName(), - 'debug' => (bool) $config->get('debug', 0), - 'sef' => (bool) $config->get('sef', 0), - 'caching' => (bool) $config->get('caching', 0), - 'articles' => $articles, - 'users' => $users, - 'extensions' => $extensions, - 'brand' => self::BRAND_NAME, - 'plugin_version' => $this->getPluginVersion(), - ]); - } - /** * Health check action — delegates to existing health check logic. * @@ -2655,7 +657,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $config = Factory::getConfig(); return [ - 'brand' => self::BRAND_NAME, + 'brand' => 'MokoWaaS', 'plugin_version' => $this->getPluginVersion(), 'joomla_version' => JVERSION, 'php_version' => PHP_VERSION, @@ -3658,183 +1660,6 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface $this->app->close(); } - // ------------------------------------------------------------------ - // Remote Install Endpoint (called from onAfterInitialise) - // ------------------------------------------------------------------ - - /** - * Handle remote extension install requests. - * - * POST /?mokowaas=install with a ZIP URL in the request body. - * Requires the same health API token + HTTPS. Downloads the ZIP - * and installs via Joomla's InstallerModel. - * - * Request: POST /?mokowaas=install - * Headers: Authorization: Bearer - * Body: {"url": "https://example.com/extension.zip"} - * - * @return void - * - * @since 02.01.39 - */ - protected function handleInstallAction() - { - if ($this->app->input->getMethod() !== 'POST') - { - $this->sendHealthResponse(405, ['error' => 'POST required']); - - return; - } - - // Parse request body - $body = json_decode(file_get_contents('php://input'), true); - $url = $body['url'] ?? ''; - - if (empty($url)) - { - $this->sendHealthResponse(400, ['error' => 'url required']); - - return; - } - - // Validate URL is HTTPS - if (stripos($url, 'https://') !== 0) - { - $this->sendHealthResponse(400, ['error' => 'HTTPS URL required']); - - return; - } - - try - { - // Download the ZIP - $tmpFile = $this->app->getConfig()->get('tmp_path', JPATH_ROOT . '/tmp') - . '/mokowaas_install_' . md5($url) . '.zip'; - - $ch = curl_init($url); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); - curl_setopt($ch, CURLOPT_TIMEOUT, 120); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - $zipData = curl_exec($ch); - $code = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE); - $error = curl_error($ch); - curl_close($ch); - - if ($error || $code !== 200 || empty($zipData)) - { - $this->sendHealthResponse(502, [ - 'error' => 'Download failed', - 'http' => $code, - 'message' => $error ?: 'Empty response', - ]); - - return; - } - - file_put_contents($tmpFile, $zipData); - - // Extract ZIP to temp directory - $extractDir = $this->app->getConfig()->get('tmp_path', JPATH_ROOT . '/tmp') - . '/mokowaas_extract_' . md5($url); - - if (is_dir($extractDir)) - { - $this->rmdirRecursive($extractDir); - } - - mkdir($extractDir, 0755, true); - - $zip = new \ZipArchive(); - - if ($zip->open($tmpFile) !== true) - { - @unlink($tmpFile); - $this->sendHealthResponse(500, ['error' => 'Failed to open ZIP']); - - return; - } - - $zip->extractTo($extractDir); - $zip->close(); - @unlink($tmpFile); - - // Install using Joomla's installer - $installer = \Joomla\CMS\Installer\Installer::getInstance(); - $result = $installer->install($extractDir); - - $this->rmdirRecursive($extractDir); - - if ($result) - { - $this->sendHealthResponse(200, [ - 'status' => 'installed', - 'message' => 'Extension installed successfully', - 'url' => $url, - ]); - } - else - { - $this->sendHealthResponse(500, [ - 'error' => 'Installation failed', - 'message' => 'Joomla installer returned false', - 'url' => $url, - ]); - } - } - catch (\Exception $e) - { - @unlink($tmpFile ?? ''); - - if (!empty($extractDir) && is_dir($extractDir)) - { - $this->rmdirRecursive($extractDir); - } - - $this->sendHealthResponse(500, [ - 'error' => 'Install exception', - 'message' => $e->getMessage(), - 'url' => $url, - ]); - } - } - - /** - * Recursively remove a directory. - * - * @param string $dir Directory path - * - * @return void - * - * @since 02.06.00 - */ - protected function rmdirRecursive(string $dir): void - { - if (!is_dir($dir)) - { - return; - } - - $items = new \RecursiveIteratorIterator( - new \RecursiveDirectoryIterator($dir, \FilesystemIterator::SKIP_DOTS), - \RecursiveIteratorIterator::CHILD_FIRST - ); - - foreach ($items as $item) - { - if ($item->isDir()) - { - rmdir($item->getPathname()); - } - else - { - unlink($item->getPathname()); - } - } - - rmdir($dir); - } - // ------------------------------------------------------------------ // Site Alias handling // ------------------------------------------------------------------ diff --git a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php b/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php deleted file mode 100644 index 77bc48fb..00000000 --- a/src/packages/plg_system_mokowaas/Field/AllowedIpsField.php +++ /dev/null @@ -1,72 +0,0 @@ - - * - * SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later - * - * FILE INFORMATION - * DEFGROUP: Joomla.Plugin - * INGROUP: MokoWaaS - * VERSION: 02.34.08 - * PATH: /src/Field/AllowedIpsField.php - * BRIEF: Custom form field that displays the current IP whitelist - */ - -namespace Moko\Plugin\System\MokoWaaS\Field; - -defined('_JEXEC') or die; - -use Joomla\CMS\Factory; -use Joomla\CMS\Form\FormField; - -class AllowedIpsField extends FormField -{ - protected $type = 'AllowedIps'; - - protected function getInput() - { - $config = Factory::getApplication()->getConfig(); - $allowedRaw = $config->get('mokowaas_allowed_ips', ''); - $currentIp = $_SERVER['REMOTE_ADDR'] ?? 'unknown'; - - if (empty($allowedRaw)) - { - $status = 'Not configured'; - $ipList = 'No IPs set — emergency access is blocked.'; - } - else - { - $ips = array_map('trim', explode(',', $allowedRaw)); - $status = '' - . count($ips) . ' IP(s) configured'; - $ipItems = []; - - foreach ($ips as $ip) - { - $match = ($ip === $currentIp) - ? ' your IP' - : ''; - $ipItems[] = '' . htmlspecialchars($ip) - . '' . $match; - } - - $ipList = implode(', ', $ipItems); - } - - $yourIp = '' . htmlspecialchars($currentIp) . ''; - - return '
              ' - . 'IP Whitelist: ' . $status . '
              ' - . 'Allowed IPs: ' . $ipList . '
              ' - . 'Your current IP: ' . $yourIp . '
              ' - . 'Set public ' - . '$mokowaas_allowed_ips = \'1.2.3.4,5.6.7.8\';' - . ' in configuration.php to change.' - . '
              '; - } - - protected function getLabel() - { - return ''; - } -} diff --git a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php b/src/packages/plg_system_mokowaas/Field/CurrentIpField.php deleted file mode 100644 index 95959e33..00000000 --- a/src/packages/plg_system_mokowaas/Field/CurrentIpField.php +++ /dev/null @@ -1,40 +0,0 @@ - - * - * SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later - * - * FILE INFORMATION - * DEFGROUP: Joomla.Plugin - * INGROUP: MokoWaaS - * VERSION: 02.34.08 - * PATH: /src/Field/CurrentIpField.php - * BRIEF: Read-only field that displays the current user's IP address - */ - -namespace Moko\Plugin\System\MokoWaaS\Field; - -defined('_JEXEC') or die; - -use Joomla\CMS\Form\FormField; - -class CurrentIpField extends FormField -{ - protected $type = 'CurrentIp'; - - protected function getInput() - { - $currentIp = $_SERVER['REMOTE_ADDR'] ?? 'unknown'; - - return '
              ' - . 'Your current IP: ' - . '' . htmlspecialchars($currentIp) . ' ' - . '— add this to the table below to keep your session alive.' - . '
              '; - } - - protected function getLabel() - { - return ''; - } -} diff --git a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php b/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php deleted file mode 100644 index 176f561d..00000000 --- a/src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php +++ /dev/null @@ -1,237 +0,0 @@ -getQuery(true) - ->select('*') - ->from($db->quoteName('#__scheduler_tasks')) - ->where($db->quoteName('type') . ' = ' . $db->quote('mokowaas.demo.reset')); - - $db->setQuery($query); - $task = $db->loadAssoc(); - } - catch (\Throwable $e) - { - $task = null; - } - - $newTaskLink = Route::_('index.php?option=com_scheduler&task=task.add'); - - if (!$task) - { - return '
              ' - . 'No demo reset task configured. ' - . 'Create a Scheduled Task ' - . 'and select MokoWaaS Demo Reset to enable demo mode.
              '; - } - - $taskId = (int) $task['id']; - $state = (int) $task['state']; - $siteTimezone = Factory::getApplication()->get('offset', 'UTC'); - - // Parse schedule from execution_rules - $rules = json_decode($task['execution_rules'] ?? '{}', true); - $ruleType = $rules['rule-type'] ?? ''; - - switch ($ruleType) - { - case 'cron-expression': - $schedule = $rules['cron-expression'] ?? ''; - $friendlySchedule = $this->friendlySchedule($schedule); - break; - - case 'interval-minutes': - $mins = (int) ($rules['interval-minutes'] ?? 0); - - if ($mins >= 1440 && $mins % 1440 === 0) - { - $days = $mins / 1440; - $schedule = 'Every ' . $days . ' day' . ($days > 1 ? 's' : ''); - } - elseif ($mins >= 60 && $mins % 60 === 0) - { - $hours = $mins / 60; - $schedule = 'Every ' . $hours . ' hour' . ($hours > 1 ? 's' : ''); - } - else - { - $schedule = 'Every ' . $mins . ' minute' . ($mins !== 1 ? 's' : ''); - } - - $friendlySchedule = $schedule; - break; - - case 'interval-hours': - $hours = (int) ($rules['interval-hours'] ?? 0); - $schedule = 'Every ' . $hours . ' hour' . ($hours !== 1 ? 's' : ''); - $friendlySchedule = $schedule; - break; - - case 'interval-days': - $days = (int) ($rules['interval-days'] ?? 0); - $schedule = 'Every ' . $days . ' day' . ($days !== 1 ? 's' : ''); - $friendlySchedule = $schedule; - break; - - default: - $schedule = $ruleType ?: 'Not set'; - $friendlySchedule = 'Custom'; - } - - // Next execution - $nextExec = $task['next_execution'] ?? ''; - $nextFormatted = 'Not scheduled'; - $nextBadge = ''; - - if (!empty($nextExec) && $nextExec !== '0000-00-00 00:00:00') - { - try - { - $dt = new \DateTime($nextExec, new \DateTimeZone('UTC')); - $dt->setTimezone(new \DateTimeZone($siteTimezone)); - $nextFormatted = $dt->format('M j, Y g:i A T'); - } - catch (\Throwable $e) - { - $nextFormatted = $nextExec; - } - - $diff = strtotime($nextExec . ' UTC') - time(); - - if ($diff <= 0) - { - $nextBadge = 'DUE'; - } - elseif ($diff < 3600) - { - $nextBadge = 'in ' . (int) ceil($diff / 60) . ' min'; - } - elseif ($diff < 86400) - { - $nextBadge = 'in ' . round($diff / 3600, 1) . 'h'; - } - else - { - $nextBadge = 'in ' . round($diff / 86400, 1) . 'd'; - } - } - - // Last execution - $lastExec = $task['last_execution'] ?? ''; - $lastFormatted = 'Never'; - - if (!empty($lastExec) && $lastExec !== '0000-00-00 00:00:00') - { - try - { - $dt = new \DateTime($lastExec, new \DateTimeZone('UTC')); - $dt->setTimezone(new \DateTimeZone($siteTimezone)); - $lastFormatted = $dt->format('M j, Y g:i A T'); - } - catch (\Throwable $e) - { - $lastFormatted = $lastExec; - } - } - - // State badge - $stateBadge = $state === 1 - ? 'Enabled' - : 'Disabled'; - - // Link to edit the task - $editLink = Route::_('index.php?option=com_scheduler&task=task.edit&id=' . $taskId); - - // Task params — default to On when keys are missing (matches form defaults) - $taskParams = json_decode($task['params'] ?? '{}', true) ?: []; - $bannerOn = !isset($taskParams['banner_enabled']) || (int) $taskParams['banner_enabled'] === 1; - $mediaOn = !isset($taskParams['include_media']) || (int) $taskParams['include_media'] === 1; - $countdownOn = !isset($taskParams['show_countdown']) || (int) $taskParams['show_countdown'] === 1; - - // Check if snapshot exists - $snapshotExists = is_dir(JPATH_ROOT . '/mokowaas-snapshots/default'); - - // Build info card - return '
              ' - . '' - . '' - . '' - . '' - . '' - . '' - . '' - . '' - . '' - . '
              Status' . $stateBadge . '
              Schedule' . htmlspecialchars($friendlySchedule) . '
              Next Reset' . htmlspecialchars($nextFormatted) . ' ' . $nextBadge . '
              Last Reset' . htmlspecialchars($lastFormatted) . '
              Runs' . (int) ($task['times_executed'] ?? 0) . ' executed, ' . (int) ($task['times_failed'] ?? 0) . ' failed
              Baseline' . ($snapshotExists ? 'Saved' : 'Not taken yet') . '
              Banner' . ($bannerOn ? 'On' : 'Off') . ($countdownOn ? ' + countdown' : '') . '
              Images' . ($mediaOn ? 'Included' : 'Excluded') . '
              ' - . '' - . ' Manage Scheduled Task' - . '
              '; - } - - protected function getLabel() - { - return ''; - } - - /** - * Convert a cron expression to a human-readable string. - * - * @param string $cron Cron expression - * - * @return string - */ - private function friendlySchedule(string $cron): string - { - $map = [ - '* * * * *' => 'Every minute', - '*/5 * * * *' => 'Every 5 minutes', - '*/15 * * * *' => 'Every 15 minutes', - '*/30 * * * *' => 'Every 30 minutes', - '0 */1 * * *' => 'Every hour', - '0 */4 * * *' => 'Every 4 hours', - '0 */6 * * *' => 'Every 6 hours', - '0 */12 * * *' => 'Every 12 hours', - '0 0 * * *' => 'Daily at midnight', - '0 6 * * *' => 'Daily at 6:00 AM', - '0 0 * * 0' => 'Weekly (Sunday)', - '0 0 1 * *' => 'Monthly (1st)', - ]; - - return $map[$cron] ?? 'Custom'; - } -} diff --git a/src/packages/plg_system_mokowaas/Field/NextResetField.php b/src/packages/plg_system_mokowaas/Field/NextResetField.php deleted file mode 100644 index 3a9b3417..00000000 --- a/src/packages/plg_system_mokowaas/Field/NextResetField.php +++ /dev/null @@ -1,156 +0,0 @@ -form) - { - $demoEnabled = (int) $this->form->getValue('demo_mode_enabled', 'params', 0) === 1; - } - - if (!$demoEnabled) - { - return 'Demo mode is off' - . ''; - } - - // Query the actual next_execution from the scheduled task - try - { - $db = Factory::getDbo(); - $query = $db->getQuery(true) - ->select([ - $db->quoteName('next_execution'), - $db->quoteName('last_execution'), - $db->quoteName('state'), - ]) - ->from($db->quoteName('#__scheduler_tasks')) - ->where($db->quoteName('type') . ' = ' . $db->quote('mokowaas.demo.reset')); - - $db->setQuery($query); - $task = $db->loadAssoc(); - } - catch (\Throwable $e) - { - $task = null; - } - - if (!$task) - { - return '
              No scheduled task found — save to create one automatically.
              ' - . ''; - } - - if ((int) $task['state'] !== 1) - { - return '
              Scheduled task is disabled.
              ' - . ''; - } - - $nextExec = $task['next_execution']; - $lastExec = $task['last_execution']; - - if (empty($nextExec) || $nextExec === '0000-00-00 00:00:00') - { - return '
              Waiting for first run...
              ' - . ''; - } - - // Convert to site timezone - $utcTimestamp = strtotime($nextExec); - $siteTimezone = Factory::getApplication()->get('offset', 'UTC'); - - try - { - $dt = new \DateTime('@' . $utcTimestamp); - $dt->setTimezone(new \DateTimeZone($siteTimezone)); - $formatted = $dt->format('l, F j, Y \a\t g:i A T'); - } - catch (\Throwable $e) - { - $formatted = $nextExec . ' UTC'; - } - - // Relative time - $diff = $utcTimestamp - time(); - $relative = ''; - - if ($diff <= 0) - { - $relative = 'overdue'; - } - elseif ($diff < 3600) - { - $mins = (int) ceil($diff / 60); - $relative = 'in ' . $mins . ' min'; - } - elseif ($diff < 86400) - { - $hours = round($diff / 3600, 1); - $relative = 'in ' . $hours . 'h'; - } - else - { - $days = round($diff / 86400, 1); - $relative = 'in ' . $days . 'd'; - } - - // Last run info - $lastInfo = ''; - - if (!empty($lastExec) && $lastExec !== '0000-00-00 00:00:00') - { - try - { - $lastDt = new \DateTime($lastExec); - $lastDt->setTimezone(new \DateTimeZone($siteTimezone)); - $lastInfo = 'Last run: ' . $lastDt->format('M j, g:i A') . ''; - } - catch (\Throwable $e) - { - // skip - } - } - - return '
              ' - . '' - . ' ' - . htmlspecialchars($formatted) . ' ' - . $relative - . $lastInfo - . '' - . '
              '; - } -} diff --git a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php b/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php deleted file mode 100644 index 2d827d9e..00000000 --- a/src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php +++ /dev/null @@ -1,175 +0,0 @@ - ['content', 'categories', 'fields', 'fields_values', 'fields_groups', 'tags', 'contentitem_tag_map', 'ucm_content', 'ucm_history'], - 'Users' => ['users', 'user_usergroup_map', 'user_profiles', 'usergroups', 'user_keys', 'user_mfa'], - 'Menus' => ['menu', 'menu_types'], - 'Modules' => ['modules', 'modules_menu'], - 'Assets' => ['assets'], - ]; - - protected function getInput() - { - $db = Factory::getDbo(); - $prefix = $db->getPrefix(); - $tables = $db->getTableList(); - - // Resolve selected values - $selected = $this->value; - - if ($selected === null || $selected === '') - { - $selected = self::DEFAULT_TABLES; - } - elseif (is_string($selected)) - { - $selected = array_filter(array_map('trim', explode("\n", $selected))); - } - - $selected = (array) $selected; - - // Flatten nested arrays from broken save format [["#__content"],["#__categories"]] - $selected = array_map(function ($v) { - return is_array($v) ? reset($v) : $v; - }, $selected); - - // Group tables - $grouped = []; - - foreach ($tables as $table) - { - if (strpos($table, $prefix) !== 0) - { - continue; - } - - $suffix = substr($table, strlen($prefix)); - $logical = '#__' . $suffix; - $group = 'Other'; - - foreach (self::TABLE_GROUPS as $groupName => $patterns) - { - if (in_array($suffix, $patterns, true)) - { - $group = $groupName; - break; - } - } - - $grouped[$group][] = $logical; - } - - // Build HTML select with optgroups - $size = (int) ($this->element['size'] ?? 15); - $html = ''; - - // "Reset to defaults" link - $defaultsJson = htmlspecialchars(json_encode(self::DEFAULT_TABLES), ENT_QUOTES, 'UTF-8'); - $html .= '
              ' - . ' Reset to defaults' - . '
              '; - - return $html; - } -} diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php b/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php deleted file mode 100644 index b52d592d..00000000 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php +++ /dev/null @@ -1,819 +0,0 @@ -db = $db ?: Factory::getDbo(); - } - - /** - * Process an incoming sync payload. - * - * @param array $payload Decoded JSON payload from the source site - * - * @return array Result summary with per-type counts and warnings - * - * @since 02.21.00 - */ - public function receive(array $payload): array - { - if (empty($payload['mokowaas_sync'])) - { - return ['status' => 'error', 'message' => 'Invalid payload — missing mokowaas_sync version']; - } - - $this->warnings = []; - $results = []; - - // Apply in dependency order - try - { - $results['categories'] = $this->applyCategories($payload['categories'] ?? []); - } - catch (\Throwable $e) - { - $results['categories'] = ['error' => $e->getMessage()]; - $this->warnings[] = 'Categories failed: ' . $e->getMessage(); - } - - try - { - $results['articles'] = $this->applyArticles($payload['articles'] ?? []); - } - catch (\Throwable $e) - { - $results['articles'] = ['error' => $e->getMessage()]; - $this->warnings[] = 'Articles failed: ' . $e->getMessage(); - } - - try - { - $results['menu_types'] = $this->applyMenuTypes($payload['menu_types'] ?? []); - } - catch (\Throwable $e) - { - $results['menu_types'] = ['error' => $e->getMessage()]; - $this->warnings[] = 'Menu types failed: ' . $e->getMessage(); - } - - try - { - $results['menu_items'] = $this->applyMenuItems($payload['menu_items'] ?? []); - } - catch (\Throwable $e) - { - $results['menu_items'] = ['error' => $e->getMessage()]; - $this->warnings[] = 'Menu items failed: ' . $e->getMessage(); - } - - try - { - $results['modules'] = $this->applyModules($payload['modules'] ?? []); - } - catch (\Throwable $e) - { - $results['modules'] = ['error' => $e->getMessage()]; - $this->warnings[] = 'Modules failed: ' . $e->getMessage(); - } - - Log::add( - sprintf('Content sync received from %s', $payload['source_site'] ?? 'unknown'), - Log::INFO, - 'mokowaas' - ); - - return [ - 'status' => 'ok', - 'message' => 'Sync applied', - 'source_site' => $payload['source_site'] ?? '', - 'results' => $results, - 'warnings' => $this->warnings, - ]; - } - - /** - * Apply categories — sorted by path depth (shallow first). - * - * @param array $categories Category data from payload - * - * @return array ['inserted' => N, 'updated' => N] - * - * @since 02.21.00 - */ - private function applyCategories(array $categories): array - { - $db = $this->db; - $inserted = 0; - $updated = 0; - - // Sort by path depth — parents before children - usort($categories, function ($a, $b) { - return substr_count($a['path'], '/') - substr_count($b['path'], '/'); - }); - - foreach ($categories as $cat) - { - $alias = $cat['alias'] ?? ''; - $path = $cat['path'] ?? $alias; - - if (empty($alias) || !preg_match('/^[a-z0-9\-\/]+$/i', $path)) - { - $this->warnings[] = 'Skipped category with invalid alias/path: ' . $alias; - continue; - } - - // Resolve parent ID from path - $parentId = 1; // Root - $pathParts = explode('/', $path); - - if (count($pathParts) > 1) - { - $parentPath = implode('/', array_slice($pathParts, 0, -1)); - $parentId = $this->resolveCategoryPath($parentPath); - - if ($parentId === 0) - { - $this->warnings[] = 'Parent category not found for: ' . $path; - $parentId = 1; - } - } - - // Check if category exists - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__categories')) - ->where($db->quoteName('alias') . ' = ' . $db->quote($alias)) - ->where($db->quoteName('extension') . ' = ' . $db->quote('com_content')) - ->where($db->quoteName('parent_id') . ' = ' . (int) $parentId); - - $db->setQuery($query); - $existingId = (int) $db->loadResult(); - - $now = Factory::getDate()->toSql(); - - if ($existingId) - { - $query = $db->getQuery(true) - ->update($db->quoteName('#__categories')) - ->set($db->quoteName('title') . ' = ' . $db->quote($cat['title'])) - ->set($db->quoteName('description') . ' = ' . $db->quote($cat['description'] ?? '')) - ->set($db->quoteName('published') . ' = ' . (int) ($cat['published'] ?? 1)) - ->set($db->quoteName('access') . ' = ' . (int) ($cat['access'] ?? 1)) - ->set($db->quoteName('language') . ' = ' . $db->quote($cat['language'] ?? '*')) - ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($cat['params'] ?? new \stdClass))) - ->set($db->quoteName('metadata') . ' = ' . $db->quote(json_encode($cat['metadata'] ?? new \stdClass))) - ->set($db->quoteName('modified_time') . ' = ' . $db->quote($now)) - ->where($db->quoteName('id') . ' = ' . $existingId); - - $db->setQuery($query); - $db->execute(); - $updated++; - - $this->catPathCache[$path] = $existingId; - } - else - { - $obj = (object) [ - 'title' => $cat['title'], - 'alias' => $alias, - 'path' => $path, - 'extension' => 'com_content', - 'description' => $cat['description'] ?? '', - 'published' => (int) ($cat['published'] ?? 1), - 'access' => (int) ($cat['access'] ?? 1), - 'language' => $cat['language'] ?? '*', - 'params' => json_encode($cat['params'] ?? new \stdClass), - 'metadata' => json_encode($cat['metadata'] ?? new \stdClass), - 'parent_id' => $parentId, - 'level' => count($pathParts), - 'lft' => 0, - 'rgt' => 0, - 'created_time' => $now, - 'modified_time' => $now, - ]; - - $db->insertObject('#__categories', $obj, 'id'); - $inserted++; - - $this->catPathCache[$path] = (int) $obj->id; - - // Rebuild category tree for this extension - $this->rebuildCategoryTree(); - } - } - - return ['inserted' => $inserted, 'updated' => $updated]; - } - - /** - * Apply articles — resolve category by alias path, upsert by alias. - * - * @param array $articles Article data from payload - * - * @return array ['inserted' => N, 'updated' => N] - * - * @since 02.21.00 - */ - private function applyArticles(array $articles): array - { - $db = $this->db; - $inserted = 0; - $updated = 0; - - foreach ($articles as $article) - { - $alias = $article['alias'] ?? ''; - - if (empty($alias)) - { - continue; - } - - // Resolve category - $catPath = $article['catid_alias_path'] ?? 'uncategorised'; - $catId = $this->resolveCategoryPath($catPath); - - if ($catId === 0) - { - $catId = 2; // Joomla's built-in Uncategorised - $this->warnings[] = 'Category "' . $catPath . '" not found for article "' . $alias . '" — assigned to Uncategorised'; - } - - // Check if article exists - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__content')) - ->where($db->quoteName('alias') . ' = ' . $db->quote($alias)); - - $db->setQuery($query); - $existingId = (int) $db->loadResult(); - - $now = Factory::getDate()->toSql(); - - if ($existingId) - { - $query = $db->getQuery(true) - ->update($db->quoteName('#__content')) - ->set($db->quoteName('title') . ' = ' . $db->quote($article['title'])) - ->set($db->quoteName('introtext') . ' = ' . $db->quote($article['introtext'] ?? '')) - ->set($db->quoteName('fulltext') . ' = ' . $db->quote($article['fulltext'] ?? '')) - ->set($db->quoteName('state') . ' = ' . (int) ($article['state'] ?? 1)) - ->set($db->quoteName('catid') . ' = ' . $catId) - ->set($db->quoteName('access') . ' = ' . (int) ($article['access'] ?? 1)) - ->set($db->quoteName('language') . ' = ' . $db->quote($article['language'] ?? '*')) - ->set($db->quoteName('featured') . ' = ' . (int) ($article['featured'] ?? 0)) - ->set($db->quoteName('metadata') . ' = ' . $db->quote(json_encode($article['metadata'] ?? new \stdClass))) - ->set($db->quoteName('attribs') . ' = ' . $db->quote(json_encode($article['attribs'] ?? new \stdClass))) - ->set($db->quoteName('images') . ' = ' . $db->quote(json_encode($article['images'] ?? new \stdClass))) - ->set($db->quoteName('urls') . ' = ' . $db->quote(json_encode($article['urls'] ?? new \stdClass))) - ->set($db->quoteName('modified') . ' = ' . $db->quote($now)) - ->where($db->quoteName('id') . ' = ' . $existingId); - - $db->setQuery($query); - $db->execute(); - $updated++; - } - else - { - $obj = (object) [ - 'title' => $article['title'], - 'alias' => $alias, - 'introtext' => $article['introtext'] ?? '', - 'fulltext' => $article['fulltext'] ?? '', - 'state' => (int) ($article['state'] ?? 1), - 'catid' => $catId, - 'access' => (int) ($article['access'] ?? 1), - 'language' => $article['language'] ?? '*', - 'featured' => (int) ($article['featured'] ?? 0), - 'publish_up' => $article['publish_up'] ?? $now, - 'publish_down' => $article['publish_down'], - 'metadata' => json_encode($article['metadata'] ?? new \stdClass), - 'attribs' => json_encode($article['attribs'] ?? new \stdClass), - 'images' => json_encode($article['images'] ?? new \stdClass), - 'urls' => json_encode($article['urls'] ?? new \stdClass), - 'created' => $now, - 'modified' => $now, - ]; - - $db->insertObject('#__content', $obj, 'id'); - $inserted++; - } - } - - return ['inserted' => $inserted, 'updated' => $updated]; - } - - /** - * Apply menu types — insert if not exists. - * - * @param array $menuTypes Menu type data from payload - * - * @return array ['inserted' => N, 'updated' => N] - * - * @since 02.21.00 - */ - private function applyMenuTypes(array $menuTypes): array - { - $db = $this->db; - $inserted = 0; - $updated = 0; - - foreach ($menuTypes as $mt) - { - $menutype = $mt['menutype'] ?? ''; - - if (empty($menutype)) - { - continue; - } - - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__menu_types')) - ->where($db->quoteName('menutype') . ' = ' . $db->quote($menutype)); - - $db->setQuery($query); - - if ($db->loadResult()) - { - $query = $db->getQuery(true) - ->update($db->quoteName('#__menu_types')) - ->set($db->quoteName('title') . ' = ' . $db->quote($mt['title'] ?? $menutype)) - ->set($db->quoteName('description') . ' = ' . $db->quote($mt['description'] ?? '')) - ->where($db->quoteName('menutype') . ' = ' . $db->quote($menutype)); - - $db->setQuery($query); - $db->execute(); - $updated++; - } - else - { - $obj = (object) [ - 'title' => $mt['title'] ?? $menutype, - 'menutype' => $menutype, - 'description' => $mt['description'] ?? '', - ]; - - $db->insertObject('#__menu_types', $obj); - $inserted++; - } - } - - return ['inserted' => $inserted, 'updated' => $updated]; - } - - /** - * Apply menu items — resolve parent aliases and {catid:path} tokens. - * - * @param array $items Menu item data from payload - * - * @return array ['inserted' => N, 'updated' => N] - * - * @since 02.21.00 - */ - private function applyMenuItems(array $items): array - { - $db = $this->db; - $inserted = 0; - $updated = 0; - - // Sort: root items first, then children - usort($items, function ($a, $b) { - $aIsRoot = empty($a['parent_alias']); - $bIsRoot = empty($b['parent_alias']); - - if ($aIsRoot && !$bIsRoot) return -1; - if (!$aIsRoot && $bIsRoot) return 1; - - return 0; - }); - - // Resolve component IDs - $compQuery = $db->getQuery(true) - ->select([$db->quoteName('extension_id'), $db->quoteName('element')]) - ->from($db->quoteName('#__extensions')) - ->where($db->quoteName('type') . ' = ' . $db->quote('component')); - $db->setQuery($compQuery); - $compMap = []; - - foreach ($db->loadAssocList() ?: [] as $c) - { - $compMap[$c['element']] = (int) $c['extension_id']; - } - - foreach ($items as $item) - { - $alias = $item['alias'] ?? ''; - $menutype = $item['menutype'] ?? ''; - - if (empty($alias) || empty($menutype)) - { - continue; - } - - // Resolve parent - $parentId = 1; // Root menu item - - if (!empty($item['parent_alias'])) - { - $parentId = $this->resolveMenuAlias($menutype, $item['parent_alias']); - - if ($parentId === 0) - { - $this->warnings[] = 'Parent menu item "' . $item['parent_alias'] . '" not found for "' . $alias . '"'; - $parentId = 1; - } - } - - // Resolve {catid:path} tokens in link - $link = $item['link'] ?? ''; - - if (preg_match_all('/\{catid:([^}]+)\}/', $link, $matches)) - { - foreach ($matches[1] as $i => $catPath) - { - $localCatId = $this->resolveCategoryPath($catPath); - - if ($localCatId > 0) - { - $link = str_replace($matches[0][$i], (string) $localCatId, $link); - } - else - { - $this->warnings[] = 'Could not resolve {catid:' . $catPath . '} in menu item "' . $alias . '"'; - $link = str_replace($matches[0][$i], '0', $link); - } - } - } - - $componentId = $compMap[$item['component_name'] ?? ''] ?? 0; - - // Check if menu item exists - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__menu')) - ->where($db->quoteName('alias') . ' = ' . $db->quote($alias)) - ->where($db->quoteName('menutype') . ' = ' . $db->quote($menutype)) - ->where($db->quoteName('client_id') . ' = 0'); - - $db->setQuery($query); - $existingId = (int) $db->loadResult(); - - if ($existingId) - { - $query = $db->getQuery(true) - ->update($db->quoteName('#__menu')) - ->set($db->quoteName('title') . ' = ' . $db->quote($item['title'])) - ->set($db->quoteName('link') . ' = ' . $db->quote($link)) - ->set($db->quoteName('type') . ' = ' . $db->quote($item['type'] ?? 'component')) - ->set($db->quoteName('published') . ' = ' . (int) ($item['published'] ?? 1)) - ->set($db->quoteName('access') . ' = ' . (int) ($item['access'] ?? 1)) - ->set($db->quoteName('language') . ' = ' . $db->quote($item['language'] ?? '*')) - ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($item['params'] ?? new \stdClass))) - ->set($db->quoteName('parent_id') . ' = ' . $parentId) - ->set($db->quoteName('component_id') . ' = ' . $componentId) - ->set($db->quoteName('home') . ' = ' . (int) ($item['home'] ?? 0)) - ->where($db->quoteName('id') . ' = ' . $existingId); - - $db->setQuery($query); - $db->execute(); - $updated++; - } - else - { - $obj = (object) [ - 'menutype' => $menutype, - 'title' => $item['title'], - 'alias' => $alias, - 'path' => $alias, - 'link' => $link, - 'type' => $item['type'] ?? 'component', - 'published' => (int) ($item['published'] ?? 1), - 'parent_id' => $parentId, - 'level' => $parentId <= 1 ? 1 : 2, - 'component_id' => $componentId, - 'access' => (int) ($item['access'] ?? 1), - 'language' => $item['language'] ?? '*', - 'params' => json_encode($item['params'] ?? new \stdClass), - 'home' => (int) ($item['home'] ?? 0), - 'client_id' => 0, - 'lft' => 0, - 'rgt' => 0, - ]; - - $db->insertObject('#__menu', $obj, 'id'); - $inserted++; - } - } - - // Rebuild menu tree for each affected menutype - $affectedMenuTypes = array_unique(array_column($items, 'menutype')); - - foreach ($affectedMenuTypes as $mt) - { - $this->rebuildMenuTree($mt); - } - - return ['inserted' => $inserted, 'updated' => $updated]; - } - - /** - * Apply modules — upsert by title+position+client_id, rebuild menu assignments. - * - * @param array $modules Module data from payload - * - * @return array ['inserted' => N, 'updated' => N] - * - * @since 02.21.00 - */ - private function applyModules(array $modules): array - { - $db = $this->db; - $inserted = 0; - $updated = 0; - - foreach ($modules as $mod) - { - $title = $mod['title'] ?? ''; - $position = $mod['position'] ?? ''; - $clientId = (int) ($mod['client_id'] ?? 0); - - if (empty($title)) - { - continue; - } - - // Check existence by title + position + client_id - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__modules')) - ->where($db->quoteName('title') . ' = ' . $db->quote($title)) - ->where($db->quoteName('position') . ' = ' . $db->quote($position)) - ->where($db->quoteName('client_id') . ' = ' . $clientId); - - $db->setQuery($query); - $existingId = (int) $db->loadResult(); - - if ($existingId) - { - $query = $db->getQuery(true) - ->update($db->quoteName('#__modules')) - ->set($db->quoteName('module') . ' = ' . $db->quote($mod['module'] ?? '')) - ->set($db->quoteName('content') . ' = ' . $db->quote($mod['content'] ?? '')) - ->set($db->quoteName('published') . ' = ' . (int) ($mod['published'] ?? 1)) - ->set($db->quoteName('access') . ' = ' . (int) ($mod['access'] ?? 1)) - ->set($db->quoteName('language') . ' = ' . $db->quote($mod['language'] ?? '*')) - ->set($db->quoteName('params') . ' = ' . $db->quote(json_encode($mod['params'] ?? new \stdClass))) - ->where($db->quoteName('id') . ' = ' . $existingId); - - $db->setQuery($query); - $db->execute(); - $updated++; - - $moduleId = $existingId; - } - else - { - $obj = (object) [ - 'title' => $title, - 'module' => $mod['module'] ?? '', - 'position' => $position, - 'content' => $mod['content'] ?? '', - 'published' => (int) ($mod['published'] ?? 1), - 'access' => (int) ($mod['access'] ?? 1), - 'language' => $mod['language'] ?? '*', - 'params' => json_encode($mod['params'] ?? new \stdClass), - 'client_id' => $clientId, - 'ordering' => 0, - ]; - - $db->insertObject('#__modules', $obj, 'id'); - $inserted++; - $moduleId = (int) $obj->id; - } - - // Rebuild menu assignments - $query = $db->getQuery(true) - ->delete($db->quoteName('#__modules_menu')) - ->where($db->quoteName('moduleid') . ' = ' . $moduleId); - $db->setQuery($query); - $db->execute(); - - $assignment = $mod['menu_assignment'] ?? []; - $assignType = (int) ($assignment['assignment'] ?? 0); - $aliases = $assignment['menu_item_aliases'] ?? []; - - if ($assignType === 0 || empty($aliases)) - { - // All pages - $obj = (object) ['moduleid' => $moduleId, 'menuid' => 0]; - $db->insertObject('#__modules_menu', $obj); - } - else - { - foreach ($aliases as $aliasRef) - { - // Format: "menutype:alias" - $parts = explode(':', $aliasRef, 2); - - if (count($parts) !== 2) - { - continue; - } - - $menuId = $this->resolveMenuAlias($parts[0], $parts[1]); - - if ($menuId > 0) - { - $menuidValue = $assignType === -1 ? -$menuId : $menuId; - $obj = (object) ['moduleid' => $moduleId, 'menuid' => $menuidValue]; - $db->insertObject('#__modules_menu', $obj); - } - else - { - $this->warnings[] = 'Module "' . $title . '": menu item "' . $aliasRef . '" not found'; - } - } - } - } - - return ['inserted' => $inserted, 'updated' => $updated]; - } - - /** - * Resolve a category alias path to a local category ID. - * - * @param string $path Slash-delimited alias path (e.g. "blog/news") - * - * @return int Category ID, or 0 if not found - * - * @since 02.21.00 - */ - private function resolveCategoryPath(string $path): int - { - if (isset($this->catPathCache[$path])) - { - return $this->catPathCache[$path]; - } - - $db = $this->db; - $segments = explode('/', $path); - $parentId = 1; - - foreach ($segments as $segment) - { - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__categories')) - ->where($db->quoteName('alias') . ' = ' . $db->quote($segment)) - ->where($db->quoteName('parent_id') . ' = ' . $parentId) - ->where($db->quoteName('extension') . ' = ' . $db->quote('com_content')); - - $db->setQuery($query); - $id = (int) $db->loadResult(); - - if ($id === 0) - { - $this->catPathCache[$path] = 0; - - return 0; - } - - $parentId = $id; - } - - $this->catPathCache[$path] = $parentId; - - return $parentId; - } - - /** - * Resolve a menu item alias to a local menu ID. - * - * @param string $menutype Menu type key - * @param string $alias Menu item alias - * - * @return int Menu item ID, or 0 if not found - * - * @since 02.21.00 - */ - private function resolveMenuAlias(string $menutype, string $alias): int - { - $db = $this->db; - $query = $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__menu')) - ->where($db->quoteName('alias') . ' = ' . $db->quote($alias)) - ->where($db->quoteName('menutype') . ' = ' . $db->quote($menutype)) - ->where($db->quoteName('client_id') . ' = 0'); - - $db->setQuery($query); - - return (int) $db->loadResult(); - } - - /** - * Rebuild the nested set (lft/rgt) for the category tree. - * - * Uses Joomla's built-in Table rebuild method. - * - * @return void - * - * @since 02.21.00 - */ - private function rebuildCategoryTree(): void - { - try - { - $table = \Joomla\CMS\Table\Table::getInstance('Category'); - $table->rebuild(); - } - catch (\Throwable $e) - { - $this->warnings[] = 'Category tree rebuild failed: ' . $e->getMessage(); - } - } - - /** - * Rebuild the nested set (lft/rgt) for a menu type. - * - * @param string $menutype Menu type to rebuild - * - * @return void - * - * @since 02.21.00 - */ - private function rebuildMenuTree(string $menutype): void - { - try - { - $table = \Joomla\CMS\Table\Table::getInstance('Menu'); - $table->rebuild(); - } - catch (\Throwable $e) - { - $this->warnings[] = 'Menu tree rebuild failed for "' . $menutype . '": ' . $e->getMessage(); - } - } -} diff --git a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php b/src/packages/plg_system_mokowaas/Service/ContentSyncService.php deleted file mode 100644 index d75888a1..00000000 --- a/src/packages/plg_system_mokowaas/Service/ContentSyncService.php +++ /dev/null @@ -1,634 +0,0 @@ -db = $db ?: Factory::getDbo(); - } - - /** - * Build the full sync payload from local content. - * - * @return array Structured payload ready for JSON encoding - * - * @since 02.21.00 - */ - public function buildPayload(): array - { - $this->catPathMap = $this->buildCategoryPathMap(); - - return [ - 'mokowaas_sync' => '1.0', - 'source_site' => rtrim(Uri::root(), '/'), - 'generated_at' => gmdate('Y-m-d\TH:i:s\Z'), - 'categories' => $this->buildCategoryPayload(), - 'articles' => $this->buildArticlePayload(), - 'menu_types' => $this->buildMenuTypePayload(), - 'menu_items' => $this->buildMenuItemPayload(), - 'modules' => $this->buildModulePayload(), - ]; - } - - /** - * Push the sync payload to a single target site. - * - * @param string $targetUrl Base URL of the target site - * @param string $token health_api_token for the target - * - * @return array Result with status, message, and per-type counts - * - * @since 02.21.00 - */ - public function pushToTarget(string $targetUrl, string $token): array - { - $payload = $this->buildPayload(); - $jsonBody = json_encode($payload, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE); - $endpoint = rtrim($targetUrl, '/') . '/?mokowaas=sync-receive'; - - $context = stream_context_create([ - 'http' => [ - 'method' => 'POST', - 'header' => "Authorization: Bearer {$token}\r\nContent-Type: application/json\r\n", - 'content' => $jsonBody, - 'timeout' => self::HTTP_TIMEOUT, - 'ignore_errors' => true, - ], - 'ssl' => [ - 'verify_peer' => false, - 'verify_peer_name' => false, - ], - ]); - - $response = @file_get_contents($endpoint, false, $context); - - if ($response === false) - { - return [ - 'status' => 'error', - 'target' => $targetUrl, - 'message' => 'Connection failed — target unreachable', - ]; - } - - // Parse HTTP status from response headers - $httpCode = 0; - - if (isset($http_response_header[0])) - { - preg_match('/\d{3}/', $http_response_header[0], $matches); - $httpCode = (int) ($matches[0] ?? 0); - } - - $result = json_decode($response, true); - - if ($httpCode >= 400 || !$result) - { - return [ - 'status' => 'error', - 'target' => $targetUrl, - 'http_code' => $httpCode, - 'message' => $result['error'] ?? $result['message'] ?? 'Unknown error from target', - ]; - } - - $result['target'] = $targetUrl; - - return $result; - } - - /** - * Push content to all configured sync targets. - * - * @param array $targets Array of ['url' => ..., 'token' => ..., 'label' => ...] - * - * @return array Per-target results - * - * @since 02.21.00 - */ - public function syncAllTargets(array $targets): array - { - $results = []; - - foreach ($targets as $target) - { - $url = $target['url'] ?? ''; - $token = $target['token'] ?? ''; - $label = $target['label'] ?? $url; - - if (empty($url) || empty($token)) - { - $results[] = [ - 'status' => 'skipped', - 'target' => $label, - 'message' => 'Missing URL or token', - ]; - continue; - } - - try - { - $result = $this->pushToTarget($url, $token); - $result['label'] = $label; - $results[] = $result; - } - catch (\Throwable $e) - { - $results[] = [ - 'status' => 'error', - 'target' => $label, - 'message' => $e->getMessage(), - ]; - } - } - - Log::add( - sprintf('Content sync pushed to %d target(s)', count($targets)), - Log::INFO, - 'mokowaas' - ); - - return [ - 'status' => 'ok', - 'message' => sprintf('Sync completed for %d target(s)', count($results)), - 'targets' => $results, - ]; - } - - /** - * Build category ID → alias path map. - * - * @return array [id => 'parent-alias/child-alias'] - * - * @since 02.21.00 - */ - private function buildCategoryPathMap(): array - { - $db = $this->db; - $query = $db->getQuery(true) - ->select([$db->quoteName('id'), $db->quoteName('alias'), $db->quoteName('parent_id')]) - ->from($db->quoteName('#__categories')) - ->where($db->quoteName('extension') . ' = ' . $db->quote('com_content')) - ->where($db->quoteName('published') . ' != -2') - ->where($db->quoteName('id') . ' > 1'); - - $db->setQuery($query); - $rows = $db->loadAssocList('id'); - - $map = []; - - foreach ($rows as $id => $row) - { - $map[$id] = $this->resolvePathFromRows($id, $rows); - } - - return $map; - } - - /** - * Recursively build alias path for a category ID. - * - * @param int $id Category ID - * @param array $rows All category rows keyed by ID - * - * @return string Slash-delimited alias path - * - * @since 02.21.00 - */ - private function resolvePathFromRows(int $id, array $rows): string - { - if (!isset($rows[$id])) - { - return ''; - } - - $row = $rows[$id]; - $parentId = (int) $row['parent_id']; - - if ($parentId <= 1 || !isset($rows[$parentId])) - { - return $row['alias']; - } - - return $this->resolvePathFromRows($parentId, $rows) . '/' . $row['alias']; - } - - /** - * Build category payload. - * - * @return array - * - * @since 02.21.00 - */ - private function buildCategoryPayload(): array - { - $db = $this->db; - $query = $db->getQuery(true) - ->select([ - $db->quoteName('id'), - $db->quoteName('title'), - $db->quoteName('alias'), - $db->quoteName('description'), - $db->quoteName('published'), - $db->quoteName('access'), - $db->quoteName('language'), - $db->quoteName('params'), - $db->quoteName('metadata'), - ]) - ->from($db->quoteName('#__categories')) - ->where($db->quoteName('extension') . ' = ' . $db->quote('com_content')) - ->where($db->quoteName('published') . ' != -2') - ->where($db->quoteName('id') . ' > 1') - ->order($db->quoteName('lft') . ' ASC') - ->setLimit(self::MAX_ITEMS); - - $db->setQuery($query); - $rows = $db->loadAssocList(); - - $categories = []; - - foreach ($rows as $row) - { - $categories[] = [ - 'title' => $row['title'], - 'alias' => $row['alias'], - 'path' => $this->catPathMap[(int) $row['id']] ?? $row['alias'], - 'description' => $row['description'] ?? '', - 'published' => (int) $row['published'], - 'access' => (int) $row['access'], - 'language' => $row['language'], - 'params' => json_decode($row['params'] ?: '{}', true), - 'metadata' => json_decode($row['metadata'] ?: '{}', true), - ]; - } - - return $categories; - } - - /** - * Build article payload. - * - * @return array - * - * @since 02.21.00 - */ - private function buildArticlePayload(): array - { - $db = $this->db; - $query = $db->getQuery(true) - ->select([ - $db->quoteName('title'), - $db->quoteName('alias'), - $db->quoteName('introtext'), - $db->quoteName('fulltext'), - $db->quoteName('state'), - $db->quoteName('catid'), - $db->quoteName('access'), - $db->quoteName('language'), - $db->quoteName('featured'), - $db->quoteName('publish_up'), - $db->quoteName('publish_down'), - $db->quoteName('metadata'), - $db->quoteName('attribs'), - $db->quoteName('images'), - $db->quoteName('urls'), - ]) - ->from($db->quoteName('#__content')) - ->where($db->quoteName('state') . ' != -2') - ->order($db->quoteName('id') . ' ASC') - ->setLimit(self::MAX_ITEMS); - - $db->setQuery($query); - $rows = $db->loadAssocList(); - - $articles = []; - - foreach ($rows as $row) - { - $articles[] = [ - 'title' => $row['title'], - 'alias' => $row['alias'], - 'introtext' => $row['introtext'], - 'fulltext' => $row['fulltext'], - 'state' => (int) $row['state'], - 'catid_alias_path' => $this->catPathMap[(int) $row['catid']] ?? 'uncategorised', - 'access' => (int) $row['access'], - 'language' => $row['language'], - 'featured' => (int) $row['featured'], - 'publish_up' => $row['publish_up'], - 'publish_down' => $row['publish_down'], - 'metadata' => json_decode($row['metadata'] ?: '{}', true), - 'attribs' => json_decode($row['attribs'] ?: '{}', true), - 'images' => json_decode($row['images'] ?: '{}', true), - 'urls' => json_decode($row['urls'] ?: '{}', true), - ]; - } - - return $articles; - } - - /** - * Build menu type payload. - * - * @return array - * - * @since 02.21.00 - */ - private function buildMenuTypePayload(): array - { - $db = $this->db; - $query = $db->getQuery(true) - ->select([ - $db->quoteName('title'), - $db->quoteName('menutype'), - $db->quoteName('description'), - ]) - ->from($db->quoteName('#__menu_types')); - - $db->setQuery($query); - - return $db->loadAssocList() ?: []; - } - - /** - * Build menu item payload with {catid:path} tokens in links. - * - * @return array - * - * @since 02.21.00 - */ - private function buildMenuItemPayload(): array - { - $db = $this->db; - $query = $db->getQuery(true) - ->select([ - $db->quoteName('a.title'), - $db->quoteName('a.alias'), - $db->quoteName('a.menutype'), - $db->quoteName('a.parent_id'), - $db->quoteName('a.link'), - $db->quoteName('a.type'), - $db->quoteName('a.published'), - $db->quoteName('a.access'), - $db->quoteName('a.language'), - $db->quoteName('a.params'), - $db->quoteName('a.home'), - $db->quoteName('a.component_id'), - $db->quoteName('b.alias', 'parent_alias'), - ]) - ->from($db->quoteName('#__menu', 'a')) - ->leftJoin( - $db->quoteName('#__menu', 'b') . ' ON ' - . $db->quoteName('a.parent_id') . ' = ' . $db->quoteName('b.id') - ) - ->where($db->quoteName('a.published') . ' != -2') - ->where($db->quoteName('a.client_id') . ' = 0') - ->where($db->quoteName('a.level') . ' >= 1') - ->order($db->quoteName('a.lft') . ' ASC') - ->setLimit(self::MAX_ITEMS); - - $db->setQuery($query); - $rows = $db->loadAssocList(); - - // Get component name map - $compQuery = $db->getQuery(true) - ->select([$db->quoteName('extension_id'), $db->quoteName('element')]) - ->from($db->quoteName('#__extensions')) - ->where($db->quoteName('type') . ' = ' . $db->quote('component')); - $db->setQuery($compQuery); - $components = $db->loadAssocList('extension_id') ?: []; - - $items = []; - - foreach ($rows as $row) - { - $link = $row['link']; - - // Encode category IDs in com_content links as {catid:path} tokens - if (preg_match('/option=com_content/', $link) && preg_match('/&id=(\d+)/', $link, $m)) - { - $catId = (int) $m[1]; - - if (isset($this->catPathMap[$catId])) - { - $link = preg_replace('/&id=\d+/', '&id={catid:' . $this->catPathMap[$catId] . '}', $link); - } - } - - $compName = ''; - - if (!empty($row['component_id']) && isset($components[$row['component_id']])) - { - $compName = $components[$row['component_id']]['element']; - } - - // Root-level items have parent_id=1 (Joomla's root menu item) - $parentAlias = ((int) $row['parent_id'] <= 1) ? '' : ($row['parent_alias'] ?? ''); - - $items[] = [ - 'title' => $row['title'], - 'alias' => $row['alias'], - 'menutype' => $row['menutype'], - 'parent_alias' => $parentAlias, - 'link' => $link, - 'type' => $row['type'], - 'component_name' => $compName, - 'published' => (int) $row['published'], - 'access' => (int) $row['access'], - 'language' => $row['language'], - 'params' => json_decode($row['params'] ?: '{}', true), - 'home' => (int) $row['home'], - ]; - } - - return $items; - } - - /** - * Build module payload with menu assignments. - * - * @return array - * - * @since 02.21.00 - */ - private function buildModulePayload(): array - { - $db = $this->db; - $query = $db->getQuery(true) - ->select([ - $db->quoteName('id'), - $db->quoteName('title'), - $db->quoteName('module'), - $db->quoteName('position'), - $db->quoteName('content'), - $db->quoteName('published'), - $db->quoteName('access'), - $db->quoteName('language'), - $db->quoteName('params'), - $db->quoteName('client_id'), - ]) - ->from($db->quoteName('#__modules')) - ->where($db->quoteName('client_id') . ' = 0') - ->where($db->quoteName('published') . ' != -2') - ->order($db->quoteName('ordering') . ' ASC') - ->setLimit(self::MAX_ITEMS); - - $db->setQuery($query); - $rows = $db->loadAssocList(); - - // Get all module-menu assignments - $mmQuery = $db->getQuery(true) - ->select([ - $db->quoteName('mm.moduleid'), - $db->quoteName('mm.menuid'), - $db->quoteName('m.alias', 'menu_alias'), - $db->quoteName('m.menutype'), - ]) - ->from($db->quoteName('#__modules_menu', 'mm')) - ->leftJoin( - $db->quoteName('#__menu', 'm') . ' ON ' - . $db->quoteName('mm.menuid') . ' = ' . $db->quoteName('m.id') - ); - $db->setQuery($mmQuery); - $allAssignments = $db->loadAssocList(); - - // Group assignments by module ID - $assignmentsByModule = []; - - foreach ($allAssignments as $a) - { - $assignmentsByModule[(int) $a['moduleid']][] = $a; - } - - $modules = []; - - foreach ($rows as $row) - { - $moduleId = (int) $row['id']; - $assignments = $assignmentsByModule[$moduleId] ?? []; - - // Determine assignment type: 0 = all pages, positive = selected, negative = excluded - $menuAliases = []; - $assignType = 0; - - if (!empty($assignments)) - { - $firstMenuId = (int) $assignments[0]['menuid']; - - if ($firstMenuId === 0) - { - $assignType = 0; // All pages - } - elseif ($firstMenuId < 0) - { - $assignType = -1; // All except selected - foreach ($assignments as $a) - { - if (!empty($a['menu_alias'])) - { - $menuAliases[] = $a['menutype'] . ':' . $a['menu_alias']; - } - } - } - else - { - $assignType = 1; // Selected only - foreach ($assignments as $a) - { - if (!empty($a['menu_alias'])) - { - $menuAliases[] = $a['menutype'] . ':' . $a['menu_alias']; - } - } - } - } - - $modules[] = [ - 'title' => $row['title'], - 'module' => $row['module'], - 'position' => $row['position'], - 'content' => $row['content'], - 'published' => (int) $row['published'], - 'access' => (int) $row['access'], - 'language' => $row['language'], - 'params' => json_decode($row['params'] ?: '{}', true), - 'client_id' => (int) $row['client_id'], - 'menu_assignment' => [ - 'assignment' => $assignType, - 'menu_item_aliases' => $menuAliases, - ], - ]; - } - - return $modules; - } -} diff --git a/src/packages/plg_system_mokowaas/Service/DemoResetService.php b/src/packages/plg_system_mokowaas/Service/DemoResetService.php deleted file mode 100644 index 5cf338ae..00000000 --- a/src/packages/plg_system_mokowaas/Service/DemoResetService.php +++ /dev/null @@ -1,606 +0,0 @@ -includeMedia = $includeMedia; - $this->snapshotDir = $baseDir ?: JPATH_ROOT . '/mokowaas-snapshots'; - } - - /** - * List all available snapshots. - * - * @return array - */ - public function listSnapshots(): array - { - $snapshots = []; - - if (!is_dir($this->snapshotDir)) - { - return $snapshots; - } - - foreach (glob($this->snapshotDir . '/*/manifest.json') as $path) - { - $data = json_decode(file_get_contents($path), true); - - if ($data && isset($data['name'])) - { - $snapshots[$data['name']] = $data; - } - } - - return $snapshots; - } - - /** - * Create a content snapshot. - * - * @param string $name Snapshot name - * - * @return array Result - */ - public function createSnapshot(string $name): array - { - $this->validateSnapshotName($name); - $this->ensureSnapshotDir(); - - $path = $this->getSnapshotPath($name); - - if (is_dir($path)) - { - $this->removeDirectory($path); - } - - mkdir($path, 0755, true); - - $db = Factory::getDbo(); - $prefix = $db->getPrefix(); - $allTables = $db->getTableList(); - $dumped = 0; - - foreach (self::SAFE_TABLES as $logicalName) - { - $realName = str_replace('#__', $prefix, $logicalName); - - if (!in_array($realName, $allTables)) - { - continue; - } - - $this->dumpTable($logicalName, $realName, $path, $db); - $dumped++; - } - - // Media - $hasMedia = false; - - if ($this->includeMedia && is_dir(JPATH_ROOT . '/images')) - { - $hasMedia = $this->zipDirectory(JPATH_ROOT . '/images', $path . '/media.zip'); - } - - $manifest = [ - 'name' => $name, - 'created_at' => gmdate('Y-m-d\TH:i:s\Z'), - 'type' => 'content-only', - 'tables' => $dumped, - 'has_media' => $hasMedia, - 'joomla_version' => JVERSION, - ]; - - file_put_contents($path . '/manifest.json', json_encode($manifest, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES)); - - Log::add(sprintf('Demo snapshot "%s" created (%d tables, media=%s)', $name, $dumped, $hasMedia ? 'yes' : 'no'), Log::INFO, 'mokowaas'); - - return [ - 'status' => 'ok', - 'message' => 'Snapshot created', - 'name' => $name, - 'tables' => $dumped, - 'has_media' => $hasMedia, - ]; - } - - /** - * Restore from a snapshot. - * - * @param string $name Snapshot name - * - * @return array Result - */ - public function restoreSnapshot(string $name): array - { - $this->validateSnapshotName($name); - - $path = $this->getSnapshotPath($name); - $manifest = $path . '/manifest.json'; - - if (!file_exists($manifest)) - { - throw new \RuntimeException('Snapshot not found: ' . $name); - } - - $manifestData = json_decode(file_get_contents($manifest), true); - - // Clear cache - try { Factory::getCache('')->clean(''); } catch (\Throwable $e) {} - - $db = Factory::getDbo(); - $prefix = $db->getPrefix(); - $restored = 0; - $sqlFiles = glob($path . '/*.sql'); - - foreach ($sqlFiles as $sqlFile) - { - try - { - $this->restoreTable($sqlFile, $db, $prefix); - $restored++; - } - catch (\Throwable $e) - { - Log::add('Demo reset: failed to restore ' . basename($sqlFile) . ': ' . $e->getMessage(), Log::ERROR, 'mokowaas'); - } - } - - // Restore /images/ - $mediaRestored = false; - - if (($manifestData['has_media'] ?? false) && file_exists($path . '/media.zip')) - { - $this->clearDirectory(JPATH_ROOT . '/images'); - $zip = new \ZipArchive(); - - if ($zip->open($path . '/media.zip') === true) - { - $zip->extractTo(JPATH_ROOT . '/images'); - $zip->close(); - $mediaRestored = true; - } - } - - // Rebuild assets table to fix ACL after content restore - $this->rebuildAssets(); - - Log::add(sprintf('Demo site reset (%d tables, media=%s)', $restored, $mediaRestored ? 'yes' : 'no'), Log::WARNING, 'mokowaas'); - - return [ - 'status' => 'ok', - 'message' => 'Site content restored', - 'baseline' => $name, - 'restored_tables' => $restored, - 'media_restored' => $mediaRestored, - ]; - } - - /** - * Delete a snapshot. - */ - public function deleteSnapshot(string $name): bool - { - $this->validateSnapshotName($name); - $path = $this->getSnapshotPath($name); - - if (!is_dir($path)) - { - return false; - } - - $this->removeDirectory($path); - - return true; - } - - /** - * Rebuild the assets table after content restore. - * - * Deletes content-related asset entries (which now have stale IDs) - * and rebuilds them using Joomla's Table classes. Extension and - * component-level assets are left untouched. - * - * @return void - */ - private function rebuildAssets(): void - { - try - { - $db = Factory::getDbo(); - - // Delete content-level assets (articles, categories, modules, etc.) - // Keep component-level and root assets intact - $contentAssetPrefixes = [ - 'com_content.article.%', - 'com_content.category.%', - 'com_contact.contact.%', - 'com_banners.banner.%', - 'com_banners.category.%', - 'com_modules.module.%', - 'com_menus.menu.%', - 'com_users.user.%', - ]; - - foreach ($contentAssetPrefixes as $prefix) - { - $db->setQuery( - $db->getQuery(true) - ->delete($db->quoteName('#__assets')) - ->where($db->quoteName('name') . ' LIKE ' . $db->quote($prefix)) - ); - $db->execute(); - } - - // Rebuild category tree (also fixes category assets) - $catTable = \Joomla\CMS\Table\Table::getInstance('Category'); - - if ($catTable) - { - $catTable->rebuild(); - } - - // Rebuild menu tree - $menuTable = \Joomla\CMS\Table\Table::getInstance('Menu'); - - if ($menuTable) - { - $menuTable->rebuild(); - } - - // Rebuild asset tree - $assetTable = \Joomla\CMS\Table\Table::getInstance('Asset'); - - if ($assetTable) - { - $assetTable->rebuild(); - } - - // Re-create assets for content items that lost theirs - $this->fixContentAssets($db); - } - catch (\Throwable $e) - { - Log::add('Asset rebuild warning: ' . $e->getMessage(), Log::WARNING, 'mokowaas'); - } - } - - /** - * Re-create missing asset entries for content items. - * - * After deleting stale assets and restoring content, some items - * may reference asset_id=0. This creates new asset rows for them. - * - * @param \Joomla\Database\DatabaseInterface $db - * - * @return void - */ - private function fixContentAssets($db): void - { - // Fix articles with missing assets - $query = $db->getQuery(true) - ->select([$db->quoteName('id'), $db->quoteName('title'), $db->quoteName('alias')]) - ->from($db->quoteName('#__content')) - ->where($db->quoteName('asset_id') . ' = 0'); - - $db->setQuery($query); - $articles = $db->loadAssocList() ?: []; - - // Find the com_content component asset as parent - $db->setQuery( - $db->getQuery(true) - ->select($db->quoteName('id')) - ->from($db->quoteName('#__assets')) - ->where($db->quoteName('name') . ' = ' . $db->quote('com_content')) - ); - $contentAssetId = (int) $db->loadResult(); - - foreach ($articles as $article) - { - $assetName = 'com_content.article.' . (int) $article['id']; - - $asset = (object) [ - 'parent_id' => $contentAssetId ?: 1, - 'lft' => 0, - 'rgt' => 0, - 'level' => 0, - 'name' => $assetName, - 'title' => $article['title'], - 'rules' => '{}', - ]; - - $db->insertObject('#__assets', $asset, 'id'); - - // Update content row with new asset_id - $db->setQuery( - $db->getQuery(true) - ->update($db->quoteName('#__content')) - ->set($db->quoteName('asset_id') . ' = ' . (int) $asset->id) - ->where($db->quoteName('id') . ' = ' . (int) $article['id']) - ); - $db->execute(); - } - - // Rebuild asset tree again after inserts - try - { - $assetTable = \Joomla\CMS\Table\Table::getInstance('Asset'); - - if ($assetTable) - { - $assetTable->rebuild(); - } - } - catch (\Throwable $e) - { - // Best effort - } - } - - // ------------------------------------------------------------------ - // Private helpers - // ------------------------------------------------------------------ - - private function dumpTable(string $logicalName, string $realName, string $dir, $db): void - { - $safeFileName = str_replace('#__', 'jml__', $logicalName); - $fp = fopen($dir . '/' . $safeFileName . '.sql', 'w'); - - $columns = $db->getTableColumns($realName, false); - $colNames = array_keys($columns); - $quotedCols = array_map([$db, 'quoteName'], $colNames); - $colList = implode(', ', $quotedCols); - $offset = 0; - - while (true) - { - $query = $db->getQuery(true) - ->select('*') - ->from($db->quoteName($realName)) - ->setLimit(self::BATCH_SIZE, $offset); - - $db->setQuery($query); - $rows = $db->loadAssocList(); - - if (empty($rows)) - { - break; - } - - $values = []; - - foreach ($rows as $row) - { - $vals = []; - - foreach ($colNames as $col) - { - $vals[] = $row[$col] === null ? 'NULL' : $db->quote($row[$col]); - } - - $values[] = '(' . implode(', ', $vals) . ')'; - } - - fwrite($fp, 'INSERT INTO ' . $db->quoteName($realName) . ' (' . $colList . ') VALUES ' . "\n" . implode(",\n", $values) . ";\n\n"); - - $offset += self::BATCH_SIZE; - - if (count($rows) < self::BATCH_SIZE) - { - break; - } - } - - fclose($fp); - } - - private function restoreTable(string $sqlFile, $db, string $prefix): void - { - $baseName = basename($sqlFile, '.sql'); - $realTable = str_replace('jml__', $prefix, $baseName); - - $db->setQuery('TRUNCATE TABLE ' . $db->quoteName($realTable)); - $db->execute(); - - $sql = file_get_contents($sqlFile); - - if (empty(trim($sql))) - { - return; - } - - $statements = array_filter( - array_map('trim', explode(";\n", $sql)), - function ($s) { return !empty($s) && $s !== ';'; } - ); - - foreach ($statements as $statement) - { - $statement = rtrim($statement, ';'); - - if (empty($statement)) - { - continue; - } - - $db->setQuery($statement); - $db->execute(); - } - } - - private function zipDirectory(string $sourceDir, string $zipPath): bool - { - $zip = new \ZipArchive(); - - if ($zip->open($zipPath, \ZipArchive::CREATE | \ZipArchive::OVERWRITE) !== true) - { - return false; - } - - $iterator = new \RecursiveIteratorIterator( - new \RecursiveDirectoryIterator($sourceDir, \RecursiveDirectoryIterator::SKIP_DOTS), - \RecursiveIteratorIterator::SELF_FIRST - ); - - foreach ($iterator as $item) - { - $rel = str_replace('\\', '/', substr($item->getPathname(), strlen($sourceDir) + 1)); - $item->isDir() ? $zip->addEmptyDir($rel) : $zip->addFile($item->getPathname(), $rel); - } - - $zip->close(); - - return true; - } - - private function ensureSnapshotDir(): void - { - if (!is_dir($this->snapshotDir)) - { - mkdir($this->snapshotDir, 0755, true); - } - - if (!file_exists($this->snapshotDir . '/.htaccess')) - { - file_put_contents($this->snapshotDir . '/.htaccess', "Deny from all\n"); - } - } - - private function getSnapshotPath(string $name): string - { - return $this->snapshotDir . '/' . $name; - } - - private function validateSnapshotName(string $name): void - { - if ($name === '' || strlen($name) > self::MAX_NAME_LENGTH || !preg_match('/^[a-zA-Z0-9_-]+$/', $name)) - { - throw new \InvalidArgumentException('Invalid snapshot name'); - } - } - - private function removeDirectory(string $dir): void - { - $items = new \RecursiveIteratorIterator( - new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS), - \RecursiveIteratorIterator::CHILD_FIRST - ); - - foreach ($items as $item) - { - $item->isDir() ? @rmdir($item->getPathname()) : @unlink($item->getPathname()); - } - - @rmdir($dir); - } - - private function clearDirectory(string $dir): void - { - if (!is_dir($dir)) return; - - $items = new \RecursiveIteratorIterator( - new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS), - \RecursiveIteratorIterator::CHILD_FIRST - ); - - foreach ($items as $item) - { - $item->isDir() ? @rmdir($item->getPathname()) : @unlink($item->getPathname()); - } - } -} diff --git a/src/packages/plg_system_mokowaas/Service/index.html b/src/packages/plg_system_mokowaas/Service/index.html deleted file mode 100644 index 2efb97f3..00000000 --- a/src/packages/plg_system_mokowaas/Service/index.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/packages/plg_system_mokowaas/forms/sync_target_entry.xml b/src/packages/plg_system_mokowaas/forms/sync_target_entry.xml deleted file mode 100644 index 301bc304..00000000 --- a/src/packages/plg_system_mokowaas/forms/sync_target_entry.xml +++ /dev/null @@ -1,15 +0,0 @@ - -
              - - - - diff --git a/src/packages/plg_system_mokowaas/forms/trusted_ip_entry.xml b/src/packages/plg_system_mokowaas/forms/trusted_ip_entry.xml deleted file mode 100644 index 4e06f396..00000000 --- a/src/packages/plg_system_mokowaas/forms/trusted_ip_entry.xml +++ /dev/null @@ -1,28 +0,0 @@ - -
              - - - - - - - diff --git a/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini b/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini index c8a6ddec..fe5a2ac5 100644 --- a/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini +++ b/src/packages/plg_system_mokowaas/language/en-GB/plg_system_mokowaas.ini @@ -7,180 +7,20 @@ ; FILE INFORMATION ; Defgroup: Joomla Language ; Ingroup: MokoWaaS -; Version: 02.01.08 -; Variables: {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} used in override templates ; File: plg_system_mokowaas.ini -; Path: /src/language/en-GB/plg_system_mokowaas.ini -; Brief: English language strings for MokoWaaS system plugin -; Notes: Contains translatable strings for plugin functionality -; Variables: (none) +; Brief: English language strings for MokoWaaS core system plugin ; ----------------------------------------------------------------------------- PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations." -PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_LABEL="Enable Branding" -PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_DESC="Enable or disable the branding overrides across the system." +; ===== Core fieldset ===== +PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_LABEL="Core" +PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_DESC="Heartbeat token for health monitoring and Grafana integration." -PLG_SYSTEM_MOKOWAAS_BRAND_NAME_LABEL="Brand Name" -PLG_SYSTEM_MOKOWAAS_BRAND_NAME_DESC="The brand name that replaces 'Joomla' throughout the interface. Used in all language overrides." -PLG_SYSTEM_MOKOWAAS_COMPANY_NAME_LABEL="Company Name" -PLG_SYSTEM_MOKOWAAS_COMPANY_NAME_DESC="Your company name, used in support links and footer text." -PLG_SYSTEM_MOKOWAAS_SUPPORT_URL_LABEL="Support URL" -PLG_SYSTEM_MOKOWAAS_SUPPORT_URL_DESC="URL for support and documentation links." - -; ===== WaaS Access fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_WAAS_ACCESS_LABEL="WaaS Access Control" -PLG_SYSTEM_MOKOWAAS_FIELDSET_WAAS_ACCESS_DESC="Master user enforcement and emergency access settings for the WaaS operator." - -PLG_SYSTEM_MOKOWAAS_ENFORCE_MASTER_USER_LABEL="Enforce Master User" -PLG_SYSTEM_MOKOWAAS_ENFORCE_MASTER_USER_DESC="Ensure the master super admin account always exists. If deleted, it will be recreated on next admin page load." -PLG_SYSTEM_MOKOWAAS_MASTER_USERNAME_LABEL="Master Username" -PLG_SYSTEM_MOKOWAAS_MASTER_USERNAME_DESC="Username for the persistent WaaS super admin account." -PLG_SYSTEM_MOKOWAAS_MASTER_EMAIL_LABEL="Master Email" -PLG_SYSTEM_MOKOWAAS_MASTER_EMAIL_DESC="Email address for the master super admin account." - -PLG_SYSTEM_MOKOWAAS_EMERGENCY_ACCESS_LABEL="Emergency Access" -PLG_SYSTEM_MOKOWAAS_EMERGENCY_ACCESS_DESC="Allow login using database credentials as a two-factor emergency access method. Requires server file access to confirm." -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_SUCCESS="Emergency access LOGIN by {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_BLOCKED_IP="Emergency access BLOCKED (unauthorized IP) — {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_WRONG_PASSWORD="Emergency access FAILED (wrong password) — {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_VERIFY_FILE_CREATED="Emergency access verification file created — {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_PENDING_FILE_DELETE="Emergency access pending file deletion — {username} from {ip}" - -PLG_SYSTEM_MOKOWAAS_ALLOWED_IPS_NOTE_LABEL="IP Whitelist" -PLG_SYSTEM_MOKOWAAS_ALLOWED_IPS_NOTE_DESC="Emergency access requires an IP whitelist. Set public $mokowaas_allowed_ips = '1.2.3.4,5.6.7.8'; in configuration.php. Emergency access is BLOCKED if no IPs are configured." - -; ===== Maintenance fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_MAINTENANCE_LABEL="Maintenance" -PLG_SYSTEM_MOKOWAAS_FIELDSET_MAINTENANCE_DESC="One-time maintenance actions. Set to Yes and save to execute. Resets to No automatically after execution." - -PLG_SYSTEM_MOKOWAAS_DEV_MODE_LABEL="Development Mode" -PLG_SYSTEM_MOKOWAAS_DEV_MODE_DESC="Disables all Joomla caching at runtime. Useful during development and testing. Does not modify configuration.php." - -PLG_SYSTEM_MOKOWAAS_RESET_HITS_LABEL="Reset All Hits" -PLG_SYSTEM_MOKOWAAS_RESET_HITS_DESC="Set all article hit counters to zero across the site. This action executes on save and resets to No." -PLG_SYSTEM_MOKOWAAS_DELETE_VERSIONS_LABEL="Delete All Versions" -PLG_SYSTEM_MOKOWAAS_DELETE_VERSIONS_DESC="Purge all content version history from the database. This action executes on save and resets to No." - -; ===== Visual Branding fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_VISUAL_LABEL="Visual Branding" -PLG_SYSTEM_MOKOWAAS_FIELDSET_VISUAL_DESC="Admin color scheme and CSS injection. Logos and favicon are shipped in the plugin media folder." - -PLG_SYSTEM_MOKOWAAS_BRANDING_NOTE_LABEL="Logos & Favicon" -PLG_SYSTEM_MOKOWAAS_BRANDING_NOTE_DESC="Logos and favicon are automatically applied from the plugin media folder (/media/plg_system_mokowaas/). Replace logo.png, favicon.ico, and favicon_256.png to change them." -PLG_SYSTEM_MOKOWAAS_COLOR_PRIMARY_LABEL="Primary Color" -PLG_SYSTEM_MOKOWAAS_COLOR_PRIMARY_DESC="Main accent color used in the admin template header and buttons." -PLG_SYSTEM_MOKOWAAS_COLOR_SIDEBAR_LABEL="Sidebar Color" -PLG_SYSTEM_MOKOWAAS_COLOR_SIDEBAR_DESC="Background color for the admin sidebar navigation." -PLG_SYSTEM_MOKOWAAS_COLOR_HEADER_LABEL="Header Color" -PLG_SYSTEM_MOKOWAAS_COLOR_HEADER_DESC="Background color for the admin top header bar." -PLG_SYSTEM_MOKOWAAS_COLOR_LINK_LABEL="Link Color" -PLG_SYSTEM_MOKOWAAS_COLOR_LINK_DESC="Color for hyperlinks in the admin interface." -PLG_SYSTEM_MOKOWAAS_BRAND_ICON_LABEL="Brand Icon (FontAwesome)" -PLG_SYSTEM_MOKOWAAS_BRAND_ICON_DESC="FontAwesome unicode codepoint for the brand icon that replaces the Joomla logo icon. Enter the hex code only (e.g. f6d5 for fa-hat-cowboy). Find codes at fontawesome.com/icons." -PLG_SYSTEM_MOKOWAAS_CUSTOM_CSS_LABEL="Custom CSS" -PLG_SYSTEM_MOKOWAAS_CUSTOM_CSS_DESC="Additional CSS injected into admin pages. Use for fine-tuning visual presentation." - -; ===== Tenant Restrictions fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_TENANT_LABEL="Tenant Restrictions" -PLG_SYSTEM_MOKOWAAS_FIELDSET_TENANT_DESC="Restrict admin features for non-master users. Master user always has full access." - -PLG_SYSTEM_MOKOWAAS_RESTRICT_INSTALLER_LABEL="Restrict Extension Installer" -PLG_SYSTEM_MOKOWAAS_RESTRICT_INSTALLER_DESC="Block non-master users from installing or removing extensions." -PLG_SYSTEM_MOKOWAAS_ALLOW_UPDATES_LABEL="Allow Extension Updates" -PLG_SYSTEM_MOKOWAAS_ALLOW_UPDATES_DESC="When the installer is restricted, still allow non-master users to update extensions." -PLG_SYSTEM_MOKOWAAS_HIDE_SYSINFO_LABEL="Hide System Information" -PLG_SYSTEM_MOKOWAAS_HIDE_SYSINFO_DESC="Block non-master users from viewing PHP, database, and server information." -PLG_SYSTEM_MOKOWAAS_RESTRICT_CONFIG_LABEL="Restrict Global Configuration" -PLG_SYSTEM_MOKOWAAS_RESTRICT_CONFIG_DESC="Block non-master users from changing Global Configuration. Component config is still accessible." -PLG_SYSTEM_MOKOWAAS_RESTRICT_TEMPLATE_LABEL="Restrict Template Code Editing" -PLG_SYSTEM_MOKOWAAS_RESTRICT_TEMPLATE_DESC="Block non-master users from editing template source code. Template styles remain accessible." -PLG_SYSTEM_MOKOWAAS_DISABLE_INSTALL_URL_LABEL="Disable Install from URL" -PLG_SYSTEM_MOKOWAAS_DISABLE_INSTALL_URL_DESC="Block installing extensions from URL for ALL users (including master) as a safety measure." -PLG_SYSTEM_MOKOWAAS_HIDDEN_MENUS_LABEL="Hidden Menu Items" -PLG_SYSTEM_MOKOWAAS_HIDDEN_MENUS_DESC="Components to hide from admin menu for non-master users. One per line (e.g., com_installer)." - -; ===== Content Sync fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_SYNC_LABEL="Content Sync" -PLG_SYSTEM_MOKOWAAS_FIELDSET_SYNC_DESC="One-way content push to remote MokoWaaS sites. Syncs articles, categories, menus, and modules by alias." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGETS_LABEL="Sync Targets" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGETS_DESC="Remote sites to push content to. Each target requires the site URL and that site's health API token." -PLG_SYSTEM_MOKOWAAS_SYNC_PUSH_NOW_LABEL="Push Content Now" -PLG_SYSTEM_MOKOWAAS_SYNC_PUSH_NOW_DESC="Set to Yes and save to immediately push all content to all configured targets. Resets to No automatically." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_LABEL="Site URL" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_DESC="Full URL of the remote Joomla site (e.g. https://client.example.com)." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_LABEL="API Token" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_DESC="The heartbeat token from the remote site's MokoWaaS plugin settings." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_LABEL="Label" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_DESC="Friendly name for this target (for identification only)." - -; ===== Diagnostics fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_DIAGNOSTICS_LABEL="Diagnostics & Monitoring" -PLG_SYSTEM_MOKOWAAS_FIELDSET_DIAGNOSTICS_DESC="Health check endpoint for external monitoring systems (e.g. Grafana). Exposes system status via a token-authenticated JSON API." - -PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_LABEL="Enable Health Endpoint" -PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_DESC="Expose a JSON health check endpoint at /?mokowaas=health. Requires a valid API token. A random token is generated automatically when enabled." +; ===== Diagnostics ===== PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Heartbeat Token" PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your Grafana datasource configuration. Send as Authorization: Bearer <token> header or &token=<value> query parameter." -PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_LABEL="Grafana URL" -PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_DESC="Base URL of your Grafana instance (e.g. https://grafana.example.com). When provided along with an API key, the plugin will auto-provision a datasource and dashboard in Grafana when the health endpoint is enabled." -PLG_SYSTEM_MOKOWAAS_GRAFANA_KEY_LABEL="Grafana API Key" -PLG_SYSTEM_MOKOWAAS_GRAFANA_KEY_DESC="Service account token or API key with Editor role in Grafana. Required for auto-provisioning the MokoWaaS datasource and dashboard." - -; ===== Security fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_SECURITY_LABEL="Security Hardening" -PLG_SYSTEM_MOKOWAAS_FIELDSET_SECURITY_DESC="HTTPS enforcement, session timeouts, password policy, and upload restrictions." - -PLG_SYSTEM_MOKOWAAS_FORCE_HTTPS_LABEL="Force HTTPS" -PLG_SYSTEM_MOKOWAAS_FORCE_HTTPS_DESC="Redirect all HTTP requests to HTTPS. Supports reverse proxy setups." -PLG_SYSTEM_MOKOWAAS_SESSION_TIMEOUT_LABEL="Admin Session Timeout" -PLG_SYSTEM_MOKOWAAS_SESSION_TIMEOUT_DESC="Minutes of idle time before admin sessions expire. 0 uses the Joomla default." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IPS_LABEL="Trusted IPs (No Session Timeout)" -PLG_SYSTEM_MOKOWAAS_TRUSTED_IPS_DESC="Sessions from these IP addresses or ranges will never time out. Supports exact IPs, CIDR notation (e.g. 10.0.0.0/24), and wildcards (e.g. 192.168.1.*)." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_ADDR_LABEL="IP / CIDR" -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_ADDR_DESC="An IP address, CIDR range, or wildcard pattern." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_LABEL_LABEL="Label" -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_LABEL_DESC="A descriptive label for this entry (e.g. Office, VPN)." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_ENABLED_LABEL="Enabled" -PLG_SYSTEM_MOKOWAAS_PASSWORD_LENGTH_LABEL="Minimum Password Length" -PLG_SYSTEM_MOKOWAAS_PASSWORD_LENGTH_DESC="Minimum number of characters required for user passwords." -PLG_SYSTEM_MOKOWAAS_PASSWORD_UPPER_LABEL="Require Uppercase" -PLG_SYSTEM_MOKOWAAS_PASSWORD_NUMBER_LABEL="Require Number" -PLG_SYSTEM_MOKOWAAS_PASSWORD_SPECIAL_LABEL="Require Special Character" -PLG_SYSTEM_MOKOWAAS_UPLOAD_TYPES_LABEL="Allowed Upload Types" -PLG_SYSTEM_MOKOWAAS_UPLOAD_TYPES_DESC="Comma-separated list of allowed file extensions for media uploads." -PLG_SYSTEM_MOKOWAAS_UPLOAD_SIZE_LABEL="Max Upload Size (MB)" -PLG_SYSTEM_MOKOWAAS_UPLOAD_SIZE_DESC="Maximum file upload size in megabytes." - -; ===== Demo Mode fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_DEMO_LABEL="Demo Mode" -PLG_SYSTEM_MOKOWAAS_FIELDSET_DEMO_DESC="Configure demo site behavior with baseline snapshots and automatic periodic reset. When enabled, a warning banner is shown on the frontend." - -PLG_SYSTEM_MOKOWAAS_DEMO_ENABLED_LABEL="Enable Demo Mode" -PLG_SYSTEM_MOKOWAAS_DEMO_ENABLED_DESC="When enabled, shows a warning banner on the frontend and enables snapshot/restore functionality." -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_MSG_LABEL="Banner Message" -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_MSG_DESC="Message displayed in the demo warning banner on the frontend." -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_COLOR_LABEL="Banner Color" -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_COLOR_DESC="Background color for the demo warning banner." -PLG_SYSTEM_MOKOWAAS_DEMO_COUNTDOWN_LABEL="Show Reset Countdown" -PLG_SYSTEM_MOKOWAAS_DEMO_COUNTDOWN_DESC="Display a countdown timer in the banner showing time until the next scheduled reset." -PLG_SYSTEM_MOKOWAAS_DEMO_SCHEDULE_LABEL="Reset Schedule" -PLG_SYSTEM_MOKOWAAS_DEMO_SCHEDULE_DESC="How often the demo site resets. Select a preset or choose Custom to enter a crontab expression." -PLG_SYSTEM_MOKOWAAS_DEMO_CRON_LABEL="Custom Crontab" -PLG_SYSTEM_MOKOWAAS_DEMO_CRON_DESC="Crontab expression for the reset schedule. Format: minute hour day month weekday (e.g. 0 */6 * * * for every 6 hours)." -PLG_SYSTEM_MOKOWAAS_DEMO_NEXT_RESET_LABEL="Next Scheduled Reset" -PLG_SYSTEM_MOKOWAAS_DEMO_NEXT_RESET_DESC="Calculated automatically from the reset schedule. The banner countdown uses this timestamp." -PLG_SYSTEM_MOKOWAAS_DEMO_TABLES_LABEL="Snapshot Tables" -PLG_SYSTEM_MOKOWAAS_DEMO_TABLES_DESC="Database tables to include in snapshots. One per line, using #__ prefix. These tables will be truncated and restored during a reset." -PLG_SYSTEM_MOKOWAAS_DEMO_MEDIA_LABEL="Include Directories" -PLG_SYSTEM_MOKOWAAS_DEMO_MEDIA_DESC="Select which directories to include in the snapshot. Images contains uploaded media, Media contains extension assets." -PLG_SYSTEM_MOKOWAAS_DEMO_ACTIVE_BASELINE_LABEL="Active Baseline Name" -PLG_SYSTEM_MOKOWAAS_DEMO_ACTIVE_BASELINE_DESC="Name of the baseline snapshot used by admin toggles and scheduled tasks. Alphanumeric, hyphens, and underscores only." -PLG_SYSTEM_MOKOWAAS_DEMO_TAKE_SNAPSHOT_LABEL="Take Snapshot Now" -PLG_SYSTEM_MOKOWAAS_DEMO_TAKE_SNAPSHOT_DESC="Save the current site state as a baseline snapshot. Uses the Active Baseline Name above. Resets to No after execution." -PLG_SYSTEM_MOKOWAAS_DEMO_RESTORE_NOW_LABEL="Restore Baseline Now" -PLG_SYSTEM_MOKOWAAS_DEMO_RESTORE_NOW_DESC="Immediately restore the site to the active baseline snapshot. WARNING: This will overwrite current content. Resets to No after execution." ; ===== Site Aliases fieldset ===== PLG_SYSTEM_MOKOWAAS_FIELDSET_ALIASES_LABEL="Site Aliases" diff --git a/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini b/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini index c8a6ddec..fe5a2ac5 100644 --- a/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini +++ b/src/packages/plg_system_mokowaas/language/en-US/plg_system_mokowaas.ini @@ -7,180 +7,20 @@ ; FILE INFORMATION ; Defgroup: Joomla Language ; Ingroup: MokoWaaS -; Version: 02.01.08 -; Variables: {{BRAND_NAME}}, {{COMPANY_NAME}}, {{SUPPORT_URL}} used in override templates ; File: plg_system_mokowaas.ini -; Path: /src/language/en-GB/plg_system_mokowaas.ini -; Brief: English language strings for MokoWaaS system plugin -; Notes: Contains translatable strings for plugin functionality -; Variables: (none) +; Brief: English language strings for MokoWaaS core system plugin ; ----------------------------------------------------------------------------- PLG_SYSTEM_MOKOWAAS="System - MokoWaaS Core" -PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations." +PLG_SYSTEM_MOKOWAAS_XML_DESCRIPTION="MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations." -PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_LABEL="Enable Branding" -PLG_SYSTEM_MOKOWAAS_ENABLE_BRANDING_DESC="Enable or disable the branding overrides across the system." +; ===== Core fieldset ===== +PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_LABEL="Core" +PLG_SYSTEM_MOKOWAAS_FIELDSET_CORE_DESC="Heartbeat token for health monitoring and Grafana integration." -PLG_SYSTEM_MOKOWAAS_BRAND_NAME_LABEL="Brand Name" -PLG_SYSTEM_MOKOWAAS_BRAND_NAME_DESC="The brand name that replaces 'Joomla' throughout the interface. Used in all language overrides." -PLG_SYSTEM_MOKOWAAS_COMPANY_NAME_LABEL="Company Name" -PLG_SYSTEM_MOKOWAAS_COMPANY_NAME_DESC="Your company name, used in support links and footer text." -PLG_SYSTEM_MOKOWAAS_SUPPORT_URL_LABEL="Support URL" -PLG_SYSTEM_MOKOWAAS_SUPPORT_URL_DESC="URL for support and documentation links." - -; ===== WaaS Access fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_WAAS_ACCESS_LABEL="WaaS Access Control" -PLG_SYSTEM_MOKOWAAS_FIELDSET_WAAS_ACCESS_DESC="Master user enforcement and emergency access settings for the WaaS operator." - -PLG_SYSTEM_MOKOWAAS_ENFORCE_MASTER_USER_LABEL="Enforce Master User" -PLG_SYSTEM_MOKOWAAS_ENFORCE_MASTER_USER_DESC="Ensure the master super admin account always exists. If deleted, it will be recreated on next admin page load." -PLG_SYSTEM_MOKOWAAS_MASTER_USERNAME_LABEL="Master Username" -PLG_SYSTEM_MOKOWAAS_MASTER_USERNAME_DESC="Username for the persistent WaaS super admin account." -PLG_SYSTEM_MOKOWAAS_MASTER_EMAIL_LABEL="Master Email" -PLG_SYSTEM_MOKOWAAS_MASTER_EMAIL_DESC="Email address for the master super admin account." - -PLG_SYSTEM_MOKOWAAS_EMERGENCY_ACCESS_LABEL="Emergency Access" -PLG_SYSTEM_MOKOWAAS_EMERGENCY_ACCESS_DESC="Allow login using database credentials as a two-factor emergency access method. Requires server file access to confirm." -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_SUCCESS="Emergency access LOGIN by {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_BLOCKED_IP="Emergency access BLOCKED (unauthorized IP) — {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_WRONG_PASSWORD="Emergency access FAILED (wrong password) — {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_VERIFY_FILE_CREATED="Emergency access verification file created — {username} from {ip}" -PLG_SYSTEM_MOKOWAAS_ACTION_EMERGENCY_PENDING_FILE_DELETE="Emergency access pending file deletion — {username} from {ip}" - -PLG_SYSTEM_MOKOWAAS_ALLOWED_IPS_NOTE_LABEL="IP Whitelist" -PLG_SYSTEM_MOKOWAAS_ALLOWED_IPS_NOTE_DESC="Emergency access requires an IP whitelist. Set public $mokowaas_allowed_ips = '1.2.3.4,5.6.7.8'; in configuration.php. Emergency access is BLOCKED if no IPs are configured." - -; ===== Maintenance fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_MAINTENANCE_LABEL="Maintenance" -PLG_SYSTEM_MOKOWAAS_FIELDSET_MAINTENANCE_DESC="One-time maintenance actions. Set to Yes and save to execute. Resets to No automatically after execution." - -PLG_SYSTEM_MOKOWAAS_DEV_MODE_LABEL="Development Mode" -PLG_SYSTEM_MOKOWAAS_DEV_MODE_DESC="Disables all Joomla caching at runtime. Useful during development and testing. Does not modify configuration.php." - -PLG_SYSTEM_MOKOWAAS_RESET_HITS_LABEL="Reset All Hits" -PLG_SYSTEM_MOKOWAAS_RESET_HITS_DESC="Set all article hit counters to zero across the site. This action executes on save and resets to No." -PLG_SYSTEM_MOKOWAAS_DELETE_VERSIONS_LABEL="Delete All Versions" -PLG_SYSTEM_MOKOWAAS_DELETE_VERSIONS_DESC="Purge all content version history from the database. This action executes on save and resets to No." - -; ===== Visual Branding fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_VISUAL_LABEL="Visual Branding" -PLG_SYSTEM_MOKOWAAS_FIELDSET_VISUAL_DESC="Admin color scheme and CSS injection. Logos and favicon are shipped in the plugin media folder." - -PLG_SYSTEM_MOKOWAAS_BRANDING_NOTE_LABEL="Logos & Favicon" -PLG_SYSTEM_MOKOWAAS_BRANDING_NOTE_DESC="Logos and favicon are automatically applied from the plugin media folder (/media/plg_system_mokowaas/). Replace logo.png, favicon.ico, and favicon_256.png to change them." -PLG_SYSTEM_MOKOWAAS_COLOR_PRIMARY_LABEL="Primary Color" -PLG_SYSTEM_MOKOWAAS_COLOR_PRIMARY_DESC="Main accent color used in the admin template header and buttons." -PLG_SYSTEM_MOKOWAAS_COLOR_SIDEBAR_LABEL="Sidebar Color" -PLG_SYSTEM_MOKOWAAS_COLOR_SIDEBAR_DESC="Background color for the admin sidebar navigation." -PLG_SYSTEM_MOKOWAAS_COLOR_HEADER_LABEL="Header Color" -PLG_SYSTEM_MOKOWAAS_COLOR_HEADER_DESC="Background color for the admin top header bar." -PLG_SYSTEM_MOKOWAAS_COLOR_LINK_LABEL="Link Color" -PLG_SYSTEM_MOKOWAAS_COLOR_LINK_DESC="Color for hyperlinks in the admin interface." -PLG_SYSTEM_MOKOWAAS_BRAND_ICON_LABEL="Brand Icon (FontAwesome)" -PLG_SYSTEM_MOKOWAAS_BRAND_ICON_DESC="FontAwesome unicode codepoint for the brand icon that replaces the Joomla logo icon. Enter the hex code only (e.g. f6d5 for fa-hat-cowboy). Find codes at fontawesome.com/icons." -PLG_SYSTEM_MOKOWAAS_CUSTOM_CSS_LABEL="Custom CSS" -PLG_SYSTEM_MOKOWAAS_CUSTOM_CSS_DESC="Additional CSS injected into admin pages. Use for fine-tuning visual presentation." - -; ===== Tenant Restrictions fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_TENANT_LABEL="Tenant Restrictions" -PLG_SYSTEM_MOKOWAAS_FIELDSET_TENANT_DESC="Restrict admin features for non-master users. Master user always has full access." - -PLG_SYSTEM_MOKOWAAS_RESTRICT_INSTALLER_LABEL="Restrict Extension Installer" -PLG_SYSTEM_MOKOWAAS_RESTRICT_INSTALLER_DESC="Block non-master users from installing or removing extensions." -PLG_SYSTEM_MOKOWAAS_ALLOW_UPDATES_LABEL="Allow Extension Updates" -PLG_SYSTEM_MOKOWAAS_ALLOW_UPDATES_DESC="When the installer is restricted, still allow non-master users to update extensions." -PLG_SYSTEM_MOKOWAAS_HIDE_SYSINFO_LABEL="Hide System Information" -PLG_SYSTEM_MOKOWAAS_HIDE_SYSINFO_DESC="Block non-master users from viewing PHP, database, and server information." -PLG_SYSTEM_MOKOWAAS_RESTRICT_CONFIG_LABEL="Restrict Global Configuration" -PLG_SYSTEM_MOKOWAAS_RESTRICT_CONFIG_DESC="Block non-master users from changing Global Configuration. Component config is still accessible." -PLG_SYSTEM_MOKOWAAS_RESTRICT_TEMPLATE_LABEL="Restrict Template Code Editing" -PLG_SYSTEM_MOKOWAAS_RESTRICT_TEMPLATE_DESC="Block non-master users from editing template source code. Template styles remain accessible." -PLG_SYSTEM_MOKOWAAS_DISABLE_INSTALL_URL_LABEL="Disable Install from URL" -PLG_SYSTEM_MOKOWAAS_DISABLE_INSTALL_URL_DESC="Block installing extensions from URL for ALL users (including master) as a safety measure." -PLG_SYSTEM_MOKOWAAS_HIDDEN_MENUS_LABEL="Hidden Menu Items" -PLG_SYSTEM_MOKOWAAS_HIDDEN_MENUS_DESC="Components to hide from admin menu for non-master users. One per line (e.g., com_installer)." - -; ===== Content Sync fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_SYNC_LABEL="Content Sync" -PLG_SYSTEM_MOKOWAAS_FIELDSET_SYNC_DESC="One-way content push to remote MokoWaaS sites. Syncs articles, categories, menus, and modules by alias." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGETS_LABEL="Sync Targets" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGETS_DESC="Remote sites to push content to. Each target requires the site URL and that site's health API token." -PLG_SYSTEM_MOKOWAAS_SYNC_PUSH_NOW_LABEL="Push Content Now" -PLG_SYSTEM_MOKOWAAS_SYNC_PUSH_NOW_DESC="Set to Yes and save to immediately push all content to all configured targets. Resets to No automatically." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_LABEL="Site URL" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_URL_DESC="Full URL of the remote Joomla site (e.g. https://client.example.com)." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_LABEL="API Token" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_TOKEN_DESC="The heartbeat token from the remote site's MokoWaaS plugin settings." -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_LABEL="Label" -PLG_SYSTEM_MOKOWAAS_SYNC_TARGET_LABEL_DESC="Friendly name for this target (for identification only)." - -; ===== Diagnostics fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_DIAGNOSTICS_LABEL="Diagnostics & Monitoring" -PLG_SYSTEM_MOKOWAAS_FIELDSET_DIAGNOSTICS_DESC="Health check endpoint for external monitoring systems (e.g. Grafana). Exposes system status via a token-authenticated JSON API." - -PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_LABEL="Enable Health Endpoint" -PLG_SYSTEM_MOKOWAAS_ENABLE_HEALTH_DESC="Expose a JSON health check endpoint at /?mokowaas=health. Requires a valid API token. A random token is generated automatically when enabled." +; ===== Diagnostics ===== PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL="Heartbeat Token" PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC="Auto-generated bearer token for the health endpoint. Use this token in your Grafana datasource configuration. Send as Authorization: Bearer <token> header or &token=<value> query parameter." -PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_LABEL="Grafana URL" -PLG_SYSTEM_MOKOWAAS_GRAFANA_URL_DESC="Base URL of your Grafana instance (e.g. https://grafana.example.com). When provided along with an API key, the plugin will auto-provision a datasource and dashboard in Grafana when the health endpoint is enabled." -PLG_SYSTEM_MOKOWAAS_GRAFANA_KEY_LABEL="Grafana API Key" -PLG_SYSTEM_MOKOWAAS_GRAFANA_KEY_DESC="Service account token or API key with Editor role in Grafana. Required for auto-provisioning the MokoWaaS datasource and dashboard." - -; ===== Security fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_SECURITY_LABEL="Security Hardening" -PLG_SYSTEM_MOKOWAAS_FIELDSET_SECURITY_DESC="HTTPS enforcement, session timeouts, password policy, and upload restrictions." - -PLG_SYSTEM_MOKOWAAS_FORCE_HTTPS_LABEL="Force HTTPS" -PLG_SYSTEM_MOKOWAAS_FORCE_HTTPS_DESC="Redirect all HTTP requests to HTTPS. Supports reverse proxy setups." -PLG_SYSTEM_MOKOWAAS_SESSION_TIMEOUT_LABEL="Admin Session Timeout" -PLG_SYSTEM_MOKOWAAS_SESSION_TIMEOUT_DESC="Minutes of idle time before admin sessions expire. 0 uses the Joomla default." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IPS_LABEL="Trusted IPs (No Session Timeout)" -PLG_SYSTEM_MOKOWAAS_TRUSTED_IPS_DESC="Sessions from these IP addresses or ranges will never time out. Supports exact IPs, CIDR notation (e.g. 10.0.0.0/24), and wildcards (e.g. 192.168.1.*)." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_ADDR_LABEL="IP / CIDR" -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_ADDR_DESC="An IP address, CIDR range, or wildcard pattern." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_LABEL_LABEL="Label" -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_LABEL_DESC="A descriptive label for this entry (e.g. Office, VPN)." -PLG_SYSTEM_MOKOWAAS_TRUSTED_IP_ENABLED_LABEL="Enabled" -PLG_SYSTEM_MOKOWAAS_PASSWORD_LENGTH_LABEL="Minimum Password Length" -PLG_SYSTEM_MOKOWAAS_PASSWORD_LENGTH_DESC="Minimum number of characters required for user passwords." -PLG_SYSTEM_MOKOWAAS_PASSWORD_UPPER_LABEL="Require Uppercase" -PLG_SYSTEM_MOKOWAAS_PASSWORD_NUMBER_LABEL="Require Number" -PLG_SYSTEM_MOKOWAAS_PASSWORD_SPECIAL_LABEL="Require Special Character" -PLG_SYSTEM_MOKOWAAS_UPLOAD_TYPES_LABEL="Allowed Upload Types" -PLG_SYSTEM_MOKOWAAS_UPLOAD_TYPES_DESC="Comma-separated list of allowed file extensions for media uploads." -PLG_SYSTEM_MOKOWAAS_UPLOAD_SIZE_LABEL="Max Upload Size (MB)" -PLG_SYSTEM_MOKOWAAS_UPLOAD_SIZE_DESC="Maximum file upload size in megabytes." - -; ===== Demo Mode fieldset ===== -PLG_SYSTEM_MOKOWAAS_FIELDSET_DEMO_LABEL="Demo Mode" -PLG_SYSTEM_MOKOWAAS_FIELDSET_DEMO_DESC="Configure demo site behavior with baseline snapshots and automatic periodic reset. When enabled, a warning banner is shown on the frontend." - -PLG_SYSTEM_MOKOWAAS_DEMO_ENABLED_LABEL="Enable Demo Mode" -PLG_SYSTEM_MOKOWAAS_DEMO_ENABLED_DESC="When enabled, shows a warning banner on the frontend and enables snapshot/restore functionality." -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_MSG_LABEL="Banner Message" -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_MSG_DESC="Message displayed in the demo warning banner on the frontend." -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_COLOR_LABEL="Banner Color" -PLG_SYSTEM_MOKOWAAS_DEMO_BANNER_COLOR_DESC="Background color for the demo warning banner." -PLG_SYSTEM_MOKOWAAS_DEMO_COUNTDOWN_LABEL="Show Reset Countdown" -PLG_SYSTEM_MOKOWAAS_DEMO_COUNTDOWN_DESC="Display a countdown timer in the banner showing time until the next scheduled reset." -PLG_SYSTEM_MOKOWAAS_DEMO_SCHEDULE_LABEL="Reset Schedule" -PLG_SYSTEM_MOKOWAAS_DEMO_SCHEDULE_DESC="How often the demo site resets. Select a preset or choose Custom to enter a crontab expression." -PLG_SYSTEM_MOKOWAAS_DEMO_CRON_LABEL="Custom Crontab" -PLG_SYSTEM_MOKOWAAS_DEMO_CRON_DESC="Crontab expression for the reset schedule. Format: minute hour day month weekday (e.g. 0 */6 * * * for every 6 hours)." -PLG_SYSTEM_MOKOWAAS_DEMO_NEXT_RESET_LABEL="Next Scheduled Reset" -PLG_SYSTEM_MOKOWAAS_DEMO_NEXT_RESET_DESC="Calculated automatically from the reset schedule. The banner countdown uses this timestamp." -PLG_SYSTEM_MOKOWAAS_DEMO_TABLES_LABEL="Snapshot Tables" -PLG_SYSTEM_MOKOWAAS_DEMO_TABLES_DESC="Database tables to include in snapshots. One per line, using #__ prefix. These tables will be truncated and restored during a reset." -PLG_SYSTEM_MOKOWAAS_DEMO_MEDIA_LABEL="Include Directories" -PLG_SYSTEM_MOKOWAAS_DEMO_MEDIA_DESC="Select which directories to include in the snapshot. Images contains uploaded media, Media contains extension assets." -PLG_SYSTEM_MOKOWAAS_DEMO_ACTIVE_BASELINE_LABEL="Active Baseline Name" -PLG_SYSTEM_MOKOWAAS_DEMO_ACTIVE_BASELINE_DESC="Name of the baseline snapshot used by admin toggles and scheduled tasks. Alphanumeric, hyphens, and underscores only." -PLG_SYSTEM_MOKOWAAS_DEMO_TAKE_SNAPSHOT_LABEL="Take Snapshot Now" -PLG_SYSTEM_MOKOWAAS_DEMO_TAKE_SNAPSHOT_DESC="Save the current site state as a baseline snapshot. Uses the Active Baseline Name above. Resets to No after execution." -PLG_SYSTEM_MOKOWAAS_DEMO_RESTORE_NOW_LABEL="Restore Baseline Now" -PLG_SYSTEM_MOKOWAAS_DEMO_RESTORE_NOW_DESC="Immediately restore the site to the active baseline snapshot. WARNING: This will overwrite current content. Resets to No after execution." ; ===== Site Aliases fieldset ===== PLG_SYSTEM_MOKOWAAS_FIELDSET_ALIASES_LABEL="Site Aliases" diff --git a/src/packages/plg_system_mokowaas/media/favicon.ico b/src/packages/plg_system_mokowaas/media/favicon.ico deleted file mode 100644 index bb4ce5482b2671a302105e878abb10f5bad1c767..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15086 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 - - - - - - - - - - - - - - - - - - - - - diff --git a/src/packages/plg_system_mokowaas/media/favicon_256.png b/src/packages/plg_system_mokowaas/media/favicon_256.png deleted file mode 100644 index 3abb73d275d6c91f5b34a7fd14cc10cf4a481767..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 75434 zcmXtA1yqz>*9GLIyBnlI8l+RYyStI@ZcwCUC~1%ek!}zW0RicfZgA-C_%GjDziS+F zW}dnCoPGA$XJ4Y#RAkXnNKjy4V9@2|q%>e)V8N%bFh~gC{*Bj{6Yv$XtDL?E3=Asn z%YRsy%xog?O+-(5Wog7UcoZD?*FGrPKVe{~VC1DFw0sw~I(=G6)#l{-caBA>ykXnN%&6G!GRN`86^! zR?OD)a=_zL?cA<)4j$6i(aZbCSueK_+1Vaf2Kzy)rAuRvONn%IjrKDYb#wdi4U0~F z7M#}g`u{~pe0cZzHc%8lR=RP~>Gm<$OOX663A%n-u^jDJlj>44jxzVwZ)%LR)pM2L z%jjt2|KMQ3qrmTgN9m_s{^{^Lze=T5gy?)Xnvd>PrcwTK1z1ROkcGo0=2V4glX@HF`8pQxtn*D(c03j0R8)&i zbn^8!BM@5f?v<65%Z=D7!E1npImnRr zEl~7$MWM}fa@;bp+@yMV^OTVYtwN6lEXMES>*4*&p{BzpTb?ZCzD+l<++c5BE(-j- zj-}Cn)vMhYECl#I*d&$GLd=kxUcslE&9@;>f!pVP%g2Ey!QZo7yY>P_tIaqV!M+(( zm8g_jrY#zD1qUVSPTBEH+woW}Ho=93+Bash3_}Js)#;Nbe%v2b8XN1%+biCE-FHwG zy)DWdDPbAbC{P>k?hZAmN~@dy=D3(Px3A4YkW7w-pj|zu&6d7>>7P1ig%>ULrxI*F z*g_IgQtqyYK>1Y)K`BVenePQ9L?_P^ViNS%d?z4RXbWqZ&m|Y-L-@vN3%CbQ%asua zZv0-eX{?6+VAmQAMh*_Nn2SNQ8L^d$Q{{vB+e{Er$xxEf)YM!^-Vc^%P&8-_Yz+(x z_3z9DS6Dxq9|$%D`eYkbZDxEw;oK)2u<#%_zyj0ZAivF02BE&~E^tl@ z*-F0{mlgfmbbbw%)`#7&M3yp0OP0;3O#6C8XcIwYLq_bJcqTza2a+;qwRPz~W5G=P)|IvaX(nZq8eK6YSH zdOR3Sw9=xUW(|VA5`e&r{Us|k1**gLsc(u(>CFCRTskQQ#cbnu%)Ghl{Go%B>GrlK z*~xvfsTJpDe2l1(=z0JuW4qj=MIaeK$^i%=h#jnB0T{OIF($$t3~lZ@CkLyeT{)8@ zdXhLmR=66_>3=g*J$rY#|Mu=T&CW>EqSN^n2quudDfGh?(SS3aMdVk(F?+_p5KY)?|A3)U3H?e|C(kQ3xTCGl25rj$ybq~d|>pUdq zX?2?D@{r`1L-joV2=i^6-%dO7ZnNT{ocVXsQ!x?5f&_|@DIBt?2j6IaJh`WnPGe8s zJ}m<{P7wRv(NQTPA_8QXee)v7^&KA%w91)^K+!z#1{~kfe_hpMp_d2ggc8+zH6=VlK68si;d5|O3bN3TTW4oHIMmo%?Tnq(Z zSM$c+P$W8B9n3GdburK#o^K`Z^hbN2-*$YRD04dm3lJvWEsRIn4uWXj@k&*ng9vP! zW`UYoqd`!Qlwi{MckhR1IZ#f(h1&CGDHLniDAOc;vZ(#iw)}lw_te*D+kO65Qh}Nr zSjkI&W8U3*ke-W&nI~C{{dIS_kEq{CKZWdRf;vV*NvX?0#M874DwR%U`LZ*B>oV}V z2348calL&gj(f{ z1_#kJgicY*%g94Z<1j&p=j~f-rMIf4pvJg?%=qxGhp5TE(H;k1MY?`IMOi^wNv(Pg zKXIUMh3fbmlnGD(I)@Sv54_t!+St?!2;@;GefqgxGx!=5f)0~v5RZG8ZJ;8|?WfM| zAFh^J>yM#fU}W;d(WENTk1T+?kNdsKpi#lF**W!ER!jq2Uag)MElv`+LRuX4axD!W z67WcEuwIJcy)@ICBl?hr_fsV%;KBhEwYCFN;mG?2#3m?6v(;*hj5yIm9?HJp8b@xg ze1&(Gl7~L@nrl~TUuK)p6U1IF*V2Mi<|^l|_O!QG0L6XVT^}S0*eKmNy3LnTsH~!* zFgiJH|JF~K0<5QWp?Wf5-Goq10w`C^sY8p=xs6`?v)6u|E7btsUuX;95rLwB`)rc8 zFMkIMKu=GPmpA}02!I-osHn5MXh)8<{!ZA9+DggTuAyf)EaEq=^?ON7k?C{)PEaX8 zP*7XD@MeKL7}|F4FFAi5dFD6?@B@$uoBH<&dSK(|larhlH(CG~1CjyIrPX8C;L0*l zWOj4Zy)_%GHCT4=Nv)^zuL!Hu%kNsuAmKppP!9v7-)T%f!fg2b2^AOGCn-yc_R&ZZ_wde3kcECk9+4Fw|?TC{blF51DX{J!5kex zRm!!vcz^C+UUAbHab=Bc-uPV4kJ!{hURad&if2EutzG%Bt`;-CCH`Y@ z7bwN;%e?BG(AA5J2FF}y3yYsHSbA?~-z3Qa;`e?uTR?E@bFe{hAHMFNlh1s4K~2F2 z4OM&4A6rC9*Qq}FaC`oipWhDV4OexbsLP6qFhzQ!`}U9tBOcd3y>cxa{?{!% zoS+t@2Z&t#wagUq`OfS3H{YPj=4`~h)iJ>j1g+B|$ehff?K(gy1h}He+&}G%WbtkG zj=2SO3+jg7&3cS2LlH2<9$W!6xD0-DD4u$cn+*@>bFaDl6Gxr*iyvWobEzQ__KCar5(7tgYt~!sA3A#iUhU5Zk zGyz!V_Zj=l>};*}WgS|aiQm6JflBoA{^-qOQ{!E1(8*y>FNWscdX#nNCi#w}qdY1B z+w>y@L*zp3{PLbQ$Z3RRBu~s#UcPgfO|wczQ*#13<+1_(U1^yEgr^BoG_h23)| zA~a?qG<(2`LB$2}dVkoQ_Y!rT>*y{V4iD1ul)l6aU$vMA!LNeSr>R~!b9V|e8WH~q z7EUk4O4JBKQNxnc7TlSZjNJ9R(Q$%Wc{IntRl=u;9AvE%Zx($G%y$r+0Cqv;s?cIa z$W1SbD=LU51@!weV=T~y!OmHq_Nz`+NzwpCGCS7z)BSPvJvkyT2Zx#P_d!67uF&Gd zC=# zFOkTCMDyIFs&s~}YQVC1kkd3U{0&u|M2397yx$Hvkx0h%?=;brKD`Yb+C4wh7^F%Y z10Qb#Nr;HXL3ROTiw(!URy=!L$K=lau2D{e_Pfam(Enl$CeX*>zFyxtaBg;p!H(RF z)Cdz_lNJjcnbCFdJhuVZ2iVf4Vj1qtz85Gx=xAt2WYlCBu_*D@`e*%{ZU9g-S<=Q? z(ubKS5|6KXb-(EqgnHBy5eQe1n!3vl|DpgTv(KV7FE^mmBt9;Vh%v_%Wwi!?Y>wyy zX27BKMjrrod(`eu@Oz-Z_L!-qDoFQPsGs^S!Popk>@ln9g1_`%wgR{~yo7{bPhP!_ zNWqa$-}0`z99c0?t7apIP+L4v^*=%!w0w-x!b~poD^Zi`tecbO1cb zOy*jDjldFu-T;9R4KR~N1NS^0pT}`jqW|&%t^>vas6pzW)wF%1XAG^++fZeN2|zJ2 zNxyETkL{vUiwX;WbL4eU<6mnF6lHJMDE}iT40cMMjDemWbV)zj%zNWH&Gge?xshrg zf}i8QePWTr$nKTSmR~YYwm4N}9p<{FdMzM5)ZBUKm z!lJ5j1hVZedbmQn(!T=-s~%jxr=XL9Gw4(c3kyNJ3n~fVDhU3t@^m7VfKzBO@6ftd z08$0$4m|^dZ8kjnKe^^bZD9&Nfl#MKdO5dO*qtV0cvbRq$by52OfyXethmpw)Jmq_ z*C&z2e>^Bm5FGm2{W}i^`@q12rg4p2lA|IYJR;I38*Kx5xbBYz;EEt>S@mkV>y`!_ zrb?9K-xaJer~;rSAtrvQD5qpLct)SKva|w0>eA5A0HoldB7h2Odv5gDH&!Uo7drA* z0x|>Q1u(u0g?OjM{!kE59u2tBk!QCZw*i1105|}o3|u)^2G6)94~cfG5pUPPpqtAV zA)h0$ETpF-S&H{JkHI0JW;Gh*oJwXBiShuoVA(lK_?3`kxd0Xt(JwX-4n}NQGv=w1 z1)q@{LdihU2EcdgmtO*?yG&t$9IeG#lo^Me3DRu}X)e{l#r>nr0H9NV4}fq_O0?z5 z&^!dG-7&U#dQ&)2rl3OKEx!W;+jRJeiU9{X+4GeXpk3$Vf$YCIx*{NQR9I@ACVYR9 zRdPtsdFSKhYGVKT{XGIrpA>b09*a%Iz+QIfH;kyT`mtOQJJBcMKI!L%<)vh69!4Zl*f8_!XwG+6yLv zdQ*CPzPsNl;DPqhQ9n(h*L85jX6nJPaN?x_uMH;RQn*@ET6S(u!~|dypO{E`kT&!B zlU?)Tj*Y-rZ*Ol&$Nr^1y5vWH7(*d~SRi6#ojoozI(U6g9;!BKoeZTQl)D>@g>Mr< zbQ-v;TSRgkbXcPMT3*hCTfUyknG%_0fGgodOy<$v5G4)e$!yC+ZDy?T<{y`=jn!=m zpeumC(+fmF;lShnN_4HoY+aWN3LoYNP}z_zBYJ?Akd1t^L?qH4`VNOBMTy>WEy26p zY3RTu#j}~cY<&A#jT2^?m!`G!hu;h_Q zpBtnD^;~GN<>NsAwd%-=uC!>!lQLqX%=EkIFxbF(u?f^=@Tz{FK{sgM|4n$6kC(Tk zepGOu4tKhpc6p{k(Nw^xdDWxG!K83=u6iyi8)sDI@}F^FJl=W=Ux&mnhM3XQagZw1 z(*X3hZ7B>mkHAg*b=ClXd+o7K$(Jms~?@r*Gx?u zi!1i_BllekGq}oH{d2P*mgAF4;kSjoe7Y8~vrgG|rVw=Gk+*nwJSdkL__*)2@SeS6 z{D^z(-xtdS_2E=qK&0#Qb5v{*Zn;wxGHAz|ob-VvWc9+?iO@2|=}6*%V8slSv9nix zEG)g77=m(y4U26(UJ-NhcQ+VH)PUHCJ?!ua?i3|^->O|J41F^!rAZWamtoEA>iT_^ifg1;PLH{bNQiJCz1#UO|r=(`P~dnQDP%=>G43XbB=Bf;aNK9wazqh-sn2 zI@aWIPj{c9bQ0_(?6+16NHG2TQD|wGD^Iqtxz8LQ-Q)Vd!baCknUSuOcP|=KCLL5u ze*QmHH0>0QEaMTyg3-aQ`B$%AffkfLnlV*Dp>&FVs=w3iJCMG9+>W>~-z~20{iaEr z2Ev!;!|8xSo|eM?Ty?s&zW;US^^3eYXm$4ATyunCN)aU1p2*!IA-OoG=~)!A;;f%3 z641n!+Th!VLhk+7+@@5R{e5jwH*2#UAl=y>6=5J?K;+EWYXjs4CGq2|h0}apu`UaN zGK##3Fpv#EHfvhZ)pjr71o*TYgEqAD@z7KUIzCe5@QK6b z)$e}o<_+dc7H@Pj$BA@?^E~Du&dEHqOr8FXf@#GsX!q3W@it&z2cQ`cT1P%%mUV=e zfnF{6M)eS(S=LV!G(O*AXRdDpOT@a5uSxG=+U|bgs{ZSKg_-SE|4au(sn(sKQ`|cB z^}L$5bvWM{Vc!pP>3Z~jiG0wG)0agLY-WD>GLDT(K;*)8H!k@ibR=hIW^&Clo^YFl z?>15dT}+s;5NOuw@pKbt9RoopDJdzKb#PuM|KQi=be^BYn(q8t2dm@eJOJe1TX#s7 z{r9Wx989hiW4`MZm{i-IGz<>Pqhn$^fOdt&pmOF#P!-La`=(#NwVe$(ilna9J>W`` z(%lqj=;%Q8%4pyRbkoB-Qu6PEp~2Im6p%3%`lkQx#t59{^=oPXS#(t#EO1`#C^(D(_}{jOIOZxVYE71HJX{R9)s% zpODh8$(61w(YlbqA||uY|9V@PQWX%aOE-SPB{OuFozCui_1e7pLPcT6Ljv>>dc?#& zi-jLS?a;W_Lv5F{hL`24L3`F>C)Dzav~<}>7-eX3m1|3=oJdxNAhk8htvC?B32~6K zC47i%HLjdNbNv~6Qdcp~5BLiDR~0vSn`YAb!b2cvbsR)>nQGV{8h~!SUZcs0REy{j zCYMct8i(Or&haZ3&>(}{3?2Vpo`R2Pr_C zD=2t9CH`x!R{x{;0frDz)&R2#>oUv!*=%_!5gy&#)#YBywo6Zs$3fSkg;cYOzFtKxdDUYSpw+W!Uq6?( z;n3pv!JQEY-o-pC-U+YsQduc2I-8LlBYM;Re+|#)V)5n?Tscbg_uqd$zBCQ2f06YKdW+(>qHUrYAyj^W$cQN~!V)<&`B+SwPxSVR00* zF>?})46}C`Rq9kt)~bpWQ_7RvjksJ)*A9>@zI#k8`V`LlpHd)y--Jeak*~0`4oO76 z8+Eev`q~fmGT2?(Vm`L%<7@VCHXiUMf|0wav2bQH_~bdbK!?~wVQl7$%yL@bFvpxc z`0ootUbX~jBzD}JA_|HBVlruWiRmR+2=?m($r6N3X!6Fg0={O;>c_?4!JDDbTmfZ5 zx6z=A^f!`3Sm>a92&d9Fq*`8Vf(Bckb=dR|LI9c(G@@8F%C)qr=agL~iBZ#Fk!IG` z@?ph)A0QwgDB(nz7d`O_2$X}A*fd{rMngj@GpGWi049?7JIBlUkI#X>ux0fc4Gy(} z1;ls+1l}7VEoPq(1+(v>bY%lRQZ|Gw4~856ftJSnZHr-b*fvL8WWVQ66;)NzK)5+H zp%_;mSsa$8SV%_i_+{swc6A*F|61sk%9pFmw+@gAy9*$2|M&t@VJvHpjhKe66o3;y z<+nh7GB913Mw67f(Fau}{cX0_(qB*mB=VLpr6TZ-Vzri*k7Zm~vTYS?F=T7AR7$&& zM{L-Q8|>6wbPop>YRr4>I!!_-xRMt?V9C{NhmJxu;XZz3k^LeJRLv%`c4jh+N;O8J zz0X1|ZelEMV#*@oc3PQ;U`=Kbk@l{XjtH87-Ufw2MOBhU?AL#ONFz0#JPvujKc^E( z+@^h`HIjmavLdC2Vr*H|+N}s;N=ZP{|0NJF`HK8EqQ+PR5Nso0%FA)Fgn!=|#=_y8 z;Sa9Q8x!VK9H&JX8qmAG(fRgoZO%ePzbn-(*@OzDGhl@7Ym zN79kq^OBZ#LzxQ2FJe4^nFwqR?f&J|Ve4K^pcnTis9pRLIu#ffX$^rB{yGL)<6u=# z9DaU4Wp&sdO7)V5brs?8Fv6-8wZ$>R9v)G!=<}-qoG}iU{UcG1uP|U(QScrxnTQRc z5*tTHRWtSo6YF*wo!+HCsk#HvuXBgDd3bn=qNAfVzcJ(m*2%t66U^b2#%>Zl!qocY zh>bw;TZtBjQwli&N!yY?F5Ar=&PM^YKKZ}32hH%^xaLKt-Y6QBNWvE(o`nEpdz=hn zC{h?99p}N9oDmz_4!_U%f)N6{DXE-+hu(&uIiOecytcrtug5I|8i6%#^OO*5Y~-DY zBgSHr*JeE59;nS)eebDYZ$eSKkJkR+@+RA^wE?ydTDI5u?$v-4Kc}867813Xu3>;yQv@A8YB`!{M zWJyU0+HcUy{t2qrF|{)eqg2LzjfM2W^WfPy*#1>-rPq^qqF6B2 z&wqQ55Pa0S`yyEX`&XFA%gW)i8gw1!d>P{T)S)yPa_|-Z>vl>zV=%QSjHhZM;`_I- zU<-H+DHpzxuGd9(iBKeh{s=UDx3c*zpTLaim!3l%7)n`jNl(XvHMjszYQNIqXHa7n zrXsM7mrT48biLfpQXY`~e1(eOm0IMLC~Wcc=mm+9C4ZTxy^K0g{sT&>$n(QF0)Mf| z+Ntj!YQTuVIQ#wVH~oH&4fRjXPWAYXhS5?#r^gC%AlX<>V9EfN^~bp4R<>J(9H=PA zLB|1?n9nDe?FZb8#=~P(_S z+4oO~Vs>S2MyB3R-*Wsb92aNB05gNtkXtXPlg!=9u=@+E8@c145kS(o*1dUNFdFs) z%Nk^Ry-+uL{w%n58&G zJN9L^AJ6ttKGpmHI;sq>lSZxH^vOw$dCR11crM<5>MQ$au?|15we$UpdfrsW%0bfI;@NO z_z_G%!D^vRZ_|_5aAgp?xc7wr$9{KWRGs8`!M3!l8vI~c)&A%$jU9P+b7MEa4*j*XwB(M-han?_^+Bce zYoTTJ5?l;<{BeDFW)s4IYLg)~>)#aAFj-W)s$x z0^mP`(ZU-|_be@%Tjoe+Yi%w%&i2Vo3pt5cpq%MUR+-Fsqw}wSEMz5c6=-MW^JAiw z*28HTB{w7IJJ8bs$`Ey#+XQOGT0Nywp%da-grhI-V!>z>&?Iw#RQkmx>*Qfv80^{b zPTX5{=coIw=YZw2ry|vj|t_NU6$?LpVO^k=e<{#<@bWtQFoqt(1y3qRIXzGOr^XU{QU9b$BQM8 zv5deRV~H68y*ET?dvzfXvTwtde%w#Kld<2;w-myN!E zZznphXF(xG$DJYn)g$q%5_qB>p{gNV;+Sp;BAlG&W;Fg?(8e&=NFO;`9Kp>vZqK0+ zzBijxZ0&6->7IW}#aO|pM7N9eSeg=HEy7{3$%$RQ>C5HKrvJr+?98F}C9k}Q?OfOe z)=$1HbYwXOE00~&9@@?UAd5|VYdj?1QF=Y4PRWdp{I#c>^#!m#VW-G38=yjKAPsp0h)ml+Z$nv=~kGCpt z!fv`@N?isusuzK*;KAAHZ%u(NTe_|Ii1QFjhmqa;q8xyK>cbk+ldR247A&{yA-9T; z50i?QGq!ol(AVu4myZFE-~+2qA<=KxpoI5_rE7=Hq%EVYnn+=<)Y-%#<>lp~x?f=6 ze4_4YR9(-b%HXCVHo@FzD_M09OeL4NgV)$Ym{vvafjMCB2%xC8uJI+|I_+_uQ&!w>f&sY}9^=dU}f7LdCp9^RSQ*Y!>OQxWV8A<^CDohE*CsOJN zKMdLN*xRuKLJ^scRk`H*6y@{jY-!Gi&N_`PRSa+PMHbNV!DCpQa;QCD!!-3R*r?Qj zu0>$Z{>Vw_Q0d}8;^9&Ut_ROf$&dQbvsYpyfT&jdd=tOj0y|*ItM?~kMeJ#Ij#OMex`fB z{t>;u5I9f3m&*;065n9nmi+kF_X-PU0$G6+{Zee2NbR<8I%RlUt8#`%SlDqd@MwQ_ zLj7${&N*1-e?`j;V~2Yn!rbi@hIOjA>YABKSBNm8ymm5duRQz*S~L>#>sgZr?EvzF z`2;7Pe+Q|s+eb^pzunx*vG1nUd6K7Wg9A6{3 zB8F2_Q!>6te#*4mNcn3x6CJ+e5{Qr5S@bxNqamx5j$={Dj~^9|+0Nq=5;Bhnskj4t zegDd_V>9M=V{}D@{{l1*m}3AE0+&rHXvVamg_MtF6&MAB$JY+POjD^_{ZuK|K{n0r zw;Ch^i(PHz3+(MlbbCDiO-xZ9{1@3+;#1+R1 zGxV&~-5fIWP7(u}h^6aO_HgwNf-M&LADfA~2b+}X&!MlT-R(|KUe$2s>)<)8Q@SRC z)!QL9i-8bN;*(-TSy$=Tm&jfqQtde_TMQ^=3Tk&p5;0wR5XKT880bH|rHlGi(e-u}8D)Pl|jq`#rde zNl!s?P4WChBpf&nZv9lDBKVmgfw>G7XG-JRcYxmT9T8THg7OS~$cH6;g>HpO9R4v{ zzuqQ;7Ex|YIl0j6T~)mvi#_luJ@SXn_;kS!4XT+fH{iCw<){q6yoQyJ7xBF*hI~{N z(XM3=8nnYT7i!UW#N^?pRuM<{q2v&IC5x1E3!28wz9s(%SEBLyW=`5ctI5cy&{#)e zn9l$UH1(}Z)gHsmX+_W=_us#JlHCQu8 z$3I#TH;+et?|Jm*v54ml{-t3856=~`4Zd20L-S&Z0`R$9c$7vx_kB+(x}`|mm@}>R z?{q%%VCEO*pkh&)0wJ@$ZoY}U)~!*h>1F)UePI1za7x?cCn;EvrryS%Et`kSiuSCmT!5J0G3T#Yfb-BQNRK*?wH*N zHwV&Mp=ceberP=zMpXO>Y6A&l#};?7M)??yWLMHs?pfWyCZ}!u1j&(vHAsbpfaA`Y z+nH*U3qTJ$fcp#{?uE6Va$OLHF5;RWeOlg}dcPTVH`ICUFT&jy%|f6G>@jbF64EeW zR;Pwm$0-WW`;E6x!>s!B)QzSAf#DN&h}caJrpd*B4{DI-U9ogp8gp1=QWH2Clv)Bo z;eYSnjUezLOJgRc4sZW){#yMzs3Ej($x(wuut)cZ|gz483L2NKY?u51hiL1bZi;>XK%!|2kq}eU_dJvm-L7rl3$ZbCw?9a z?=i4u5U)i2@b0no4UhQ5&u~&$M0m4EQejTc*Yf?!)K#ac%N;PouXQ#T%Ko<9qq{mu z1yTu^CH|$l=E412)e#4_sSy92sH7xeI~)#DtaI|~({+w=Y_i@MlIV-;8p$TB~6;^HoSICUvfQQj~FYC}d0HGEY zu2H#7u~N9o?g&209(zig(KgHM=W7XrNw(V`P7HT&_N9T+%M@_DK`2IQivq(ZL8mfO z(VjJ@pRt6N$^SVY!88bTt*)-ZW=k(5u7(J*ks#L+KT;d6eouEI0W0$jIi)+$s8@QU3z6lApfwBQS`q5MK4QX|Uuc zB^gVMs-lUf(@SeHdS7i7!QCGeCaa3-kBL2ZID58qnag8V8``$CzqB3$ubyEf?2rWquOw8+A>3$iUWI0+iu6pZXg10LVHX;v4KKn}YA8d0o3JOQZ){^C|k^Sx5OWZOK z60yEe{C7l77K*?joYl^+u!GD!y3pb0k$4mfM8=l_-a;OVNU^k>g=$Hfw_xAM1H4r- zyPPAl%cT54=OZM6*X_!@vX$t_7>7+YQ*xQUuW99I?f!*K-JtU!by|8mv88jP`6Or- zYd{Ckfh4;(VOS5=r?)%|1$8sC1*QyWmq0frS!Od>Mv|&I+S)9tld_=YKJpWPAnl5> ziqj%$5)=w|#J-NHKqs%1b8=-Tb3pU0)jKc%#>2;;MgwD|n((ZAk&l+JF$(eVOaZjS z(;Lgr82s`!h*ru>K1g=%f#3o5_le`By93`Kmwxs#oKSYmA^l8-5h9In-4v6G*~ zRTZAtG!l>7a0Sz_3jA zo=TMxZAwvdTB_kpE#9ygIh9W70|#-Z{e;Tld3zfL@P(slmQP>P{0{_F9YjqfhLB~LCww)*Cp}Xi=802a;ELoNh%LTFS_6k1$9(oIH+ymskGlx+cbvl4L7s9ytV`)fWW8{@rsR;bY;w3S1SiBWet=)xeFR zDVpbU^H~xDdei{>G7+4RDLfUXApi59BYyJ7DNFUgw2ttsFQxjMfAyl;|wI^mc)i-^0CR{8W|){OA>F1N^gSE1<0+$_xd`whOXT*Sq~>C%fEiwXu4iKW(+QDq_x=-z*x zEuSQu)gn;g;bgXZMBb;0qb`l2+kD0D?sseFHR3+(0!K4a{w&>@k8ja=?T%#a*3N!6 z&iXcEFQ7$nBKvD(YZNK3o3#5HmKW|__)1%^3X*)$kT98}r#s4!K??$eLIo=yeL*I2 zzef9(><@J~v({(z2KO=I&}$`0{12uoB4Z;D9Tv6xlI>)s!vSB3dW%TU$i7jHL2Xtw zalI&6_-F^;dnfBJ=M4_pq@=a8XC@dxRrwY11q5Q>9!TM%tiP4wI;NI!|yoW znz8q>g^B7n?;T*RPUXQnIY&zj*_amQr+zAHer&e99)Twj^IqURTaiQidgm1eGRU~PB^v1thS!^NR%Wfg&W#XU+Wu1j{Mdpb|w=c11B@$$z zWe!PU6Q8X~5Mq8v^738&`Nu3_tF^-n4mT8?0wqsQWyDCzD(WOX+ZRDG9JhtR>oX}Z zR1^kuJC1{~c8dWFH}KtQ^}&3gdy(hn(tljgjby%6Bs6jj1LXzS6JMMQ#|>t($L-ZR z!jBh!5=`Zv$MR}#Ady5GevV2R|DoDo*+W@3gWO?iVvZ#H^)#B1C}yOZ7X;*JTRecU zCqY&C*_^00?8V3)+h=m~=f!l)2a2{gj?gO{G&6Wp;2q_TBjyWxs#ID|s=KRxV zFZMPU@L*orgBMHVVH^aKCW+}yxXp2Av$I~ElKXh$W=1909%yebPfE7yy7X&r#=%hUJF3kf|Xl9)qkju6W225hd$mk0G@S7)~m zXae3ESS)Z1i^lQ!7e8&xHn{J6x0 z6Hw2)1&L732drC`IIO%e+Y?(m4%bilnRk!DudeIP7Z00YrI3E#7*iw;;E8-v17G)a zg+;od&zS@qD!OAmYZx?2e)O1?kL1mtY%RH>?xUkArDvK(SUz3c9rAjei6Du?MOOc9 z>(>Q)uo4yvr_JE7S-w4${QlOBl??4n2~u2Y_@H#UrBD@ z*qMz^L>$SUpo$BPC6BexH2e5>E+6x05-05{qrZ?8 zCa}>uqj2KHC<03;@NDW~*%@i!M{}>7=K_ZcB4x_l{!B>7d6q(4g8f69VZ#_^aQ?IV zg%_Q?Y&H$~GaD1+XmQV9Vivbc_xPz=p=!Z&#`?kNu_u~+mME#^R7M);2evt0X%rz3 zZp-Y@wkegVMpQ!P(*&O{(`gj&6(wfGda`ixJTU+0U`}aP5!K+H*B&jeCWOC(bE+@r zawEFCTTsuGZIH%shM7Jt*e^D{78=in5mo*OlQI|&Kxe9L{UhncNiQa;)^W(De^#&l z4^55pv76gR@{F2v62yS6qHdv;*U#JO`(OyDQ$5F>WwRZyQfNb8c%*L&4#1N9{yQ?{ zmgQ|`T|*eI5bjwfV`W#g`I{1ZRlN{M(q|g~o!>u}q#^{p<`YVFr_YyeUVPh$cc3y{ z_o4>Yz&`|nbEW_vpZSc}ENP9M78PzE7Z&WH{VKAF{6F9FRJB-sI5zc&-vKtp*~fpf z{=2)PrK5^U&w=)sM_~+2D<=q#`(00!>o#9;>K{t7c-RT1Fk_{S&r0~p*H7B%h`lJo z`TwQY1P&(r{>|uyyB5~k!iOyA{>uyq53BSUaa_sTAlE6K^sA}68FL%Uv!7})Kn zIQ2Hr9ibz&h50S9_HBZovtiQ}=)H~N-Mnh>*YTy+mr3Bt-E8v@YEDX3o(j6syzj+| z=|>t0JK|lYKE{5)vHa2Mf4p8@J$Nz|;&?OHmk~FM7whlI z=X>wAmst2+FeDFhVe!fy*r7$AZ^zzbDD7>;vQ2*fRhfA1d$AmFq~3>I1g5+xIW__8 z5YJwGUB;)C>%G0o>RDjyd#WRNUd{Rb+0fJ?;%{ML%;N^(%T)NOukIqPxl@@Y@9~?& zF_omG;Vb7T#m{5AZ+UpEEO=xBS_B5IFluu29<-Qej&VM)4zfuwC(0mC;`_sK+L5)BUjvuk^v< zYFeXNSkGZpR1`Ry`A6?Hy%X#sTs?PXv?E;0-0nHC&z~0B4H#~Pd?Pl}_fuVixS5%-HL>*DJj;2V7K-{}3HNglDawk9T)KX57^W4Yj*94#I(KS! z@gMRWZbB#zJO$gXR{|~<=6>j)vbD)2;>DueKN>t$nnGD!{Dvvme>y={Do?+%{J$6A zn*I6f&wZ29SoR-!fGYIFg@kBml3M?Ty>u~Wk3twz4vVyf9%}6{HMHIYQrO#`m@~3i} zpxyqQ=H;%;+bk-Oa;buk(;%MyUkwA{TWP=BEGKMk&vt5`}N7< zmsn);-8UTB7$93u66?5X6zsD}xdma%VE$hf5@fB{de5txWvuQk9e#Kh@ zhjBc+NN&I(&+9UkiP@bad>cNAYni%)@7VsKH)`Wj%}+2{@4;ly;NNA%W0ec^?Hio~ zJm15kyUZfLQD|+Vh)$Afh(S-#wKi}Cf$`xe7eV6YV{o^#lY>>x|{2;_lkX2(C{${hGJ32eOm#aY|Q}-!ntj}EwMrg zAy4l&Wwb-CxY2(cI+gICF(YjcE6;dbW3(W*IYT*4$Xj3$s7+q}GC(-$jEH-HPkGW4 zi3UMOLD*KyF9*ki*P4b9768)!W6>6*G$5mq4n>QD-;tm5^L-bM%%y)idet=cP+M%UkcH^N?wI)u0#5*wekc z84&v}bll;QNVvQ|jTR313H~_3pAo)FE#~)NG7hHm3o6%lhP$l}kS7k8T*1XACa4^z z`b5Ot=t7IUp!1wk>gOj{z`g#6q0u4n&w|qq0r1YQW9G?iOiC#(Zpgoo0sk2-=x%P`gngq4$%j)#Ewh1cy>+r0dhrA=AYcSvxY3F&)@$}wIrET^v z@S%=u8g+a}uezzEeGJw7Schyk!rMpVA&<%~Hj2qCR%UpV4aQ(a=24x8HC2AJh(b zt~EJLmX~IJ!uMd4cM-U?3VHze01n%-J9ns4K5P(r6%>VlBVsfBC*r*{M5LsPP^rgZ zwhFIjmsV#F@$c*Cq+4FU7S<%y93)`V8ehL1(8h{Y5BspRpUd=1riRyL#jy^i?DtXk ztAFVS-G_6_9zWHsB6rZpmqcRHrz3`5L#efnz?oh}wpOX@WuH~kE$gGrqD)cwC#iRB zclO09V#e!I??M7^%#CkQ)P8jJdzB`q(o*`0vzC5Te{sCa8z|ai}aTY9zL^Rx#zWlxqUBgReU#F6w)G=15v)A|NPcH^6s;p zJ1=K-AE;HeLr~Hgu+;pw6)wrv8I@?S|4Tgxxxf2*=U&#+c{S+*ECzshSLuNC*)#G? z`dM$A6;5`H{1LMQ^`WbM6#`{AqJZ6dr57tlJ4sn8qlnLQNKT5sG}TuI&((%iK?F;Q zp7dG1#oUu-DY?7+wl{IN;0X!_&E0tg(ohdLnZ>5J9nLwzDt@gq_Q)TseBR7}(_Wqv z(u9vAgiAEgPK?6ekd&4klG~Ltf@P5BcfS}!3u=F#b3q@U3 zhJjRK`F2rIXyZa{_@4X(;?1_!|IW9BtRC0{q)9CLd%7SfA1~Z-cr%otg`zRSj(LDi zK?RrE0GjWX)LXl5!CQ;*z|Oz_Eq}@H$D6D%IWC5zOp0tEMb>~lg3s}W}lI7pxjKx894D!_(Pu6T%1iKK(kMHs9B+2 z!@hUIk6y+p15#%OHgGipRr$x(yZ!PT#9<}@Hr>Qf-*X(-Z0=VYuso03S@yHwPf~dF z*&nm>x0?IA3-c(vz3L^qERJXZN7)6O1D;X6n?J8hh3QfSz~;EYs2Bd?GtRF+pS|C~ z<=}D5&%8hR{sCM*U@K#ZRNRGG{bK4DAr*q_j1!2x0@i^`rLtP)pV@?E?yz3f>ijJh zkmfdTt$DB-nsz^ll?01Kv$0H5`3$0u{(2A)-_o}>X#k-ERb(gaD&!dk1Jhsqo&vW0 z(fcJ1#D~O!alfaF{f_Gf$-h2eTb%BiEU|HwV22|&xfh%ss*{{_RrsS`m-Xhg=rLLF zLjdwKn2a!}Pt^28#7Y9Wxyfqs(x8g}*T*b!R8f*vcd%5N^v!33dWFWj&85?1wU@P8 z&;+dH%kE!f)AWjt_h$%~t3|iWzofVWfzti?mR|z-xxEidavyuk$rry)AjvJuQ!7_> zmK5%W_BT^3b+@n>s;~b`IMj`aB`%cE$c{*@>4XwO9VjwS4{C_;;7K<$C{aE(Phqpw z6=X^6p-LhkuFQf1)+9sF7xa8`X_=soFogNN4U{>r)kc7%0d#^7AL#%3jr}}0MS&!m zfhj|F&^?v&R<5I%`>R^5?i)>5;7O!4im%mS{8_PK$YRjhzM~!}nU>_nHYMbwl*uCl z$MI}|JaN!v>=?lvZ>I7+RtF}8s0)B$E<@P7MW6kenZs0alX2hd5Kn7G+i*a)5@A3k ziAG>-W1e#qw11Du5(#|EiPotobfv23m3KslL;%At&%yi=22DW#4pH@c`0k3BBqk;U z8kGu)*Us!4nkW9VKAaDRch3#hB9D$G_iujauMY~VpP%-Ah$65{w;+jer#9ptV=r+p zi2O0u?L?VAeD8{oGW(*SE0XEf!lgx-_Ca35m}O9-aU-k@fQR>;t+?OMmEL?xT9fdV zOM)%K1Adiz1B2@LkG#26PuYhM;^tYWaHc00?Fvo#bB|5O-K!437^>1(O~7KvQRhoi zX3t389#wWY`;>3%UqF&h#mn`Uh+=?1QPtx=CMdc>E4Ji`EO^ZL#kH1Z(eP>#Z5xyxd1HkfM47E9nG zP(8=+Q*trvem@qjbvByK>Mj~RFb2H4pf{X8N9UB1ggmfVh8B?OjrXbJIsl z)*j2|u4{jaxMuCQ4a3KAFzA>sX>%!UvI z-_mQ_co15>9_(rRs)f@IJ14s?!C@xV`EK%!DCubn^>jkW6VEJM_F4yTqWsa<8LQX7 z@tXRf>uuZEutT)IRmvMve3CdF`bupyb!Iu#Oo2RXM#)C=5$djRA$VwQg~z43z%SLM z-@xMRc`!iZW11c>QM{N=mT0|DBfSEF@8(bhxg@KT6iEEPxFflKr93iit7U=yNElcsru)U+r zJiZ(s$vwJz;&DX_rD;|oslYVlMcBI07sCB9@9%iWD)}B&A`IYECETBU$?HbKmi#I^ z8Jx;=Zr_)!lqD$|BB`+oH>1!;xk5>h?$<;MW$MZ`IDzHqVvQ@lzgdk{T*LcnZd5(^ z?}7vDt{u}MUX&Eg*knlUhr2D-L!~#AYp@ylGyK4ECg8`6$JM%X%Y=+sz>aF;TyCLJ zt_IxodJaF}?l!uf+r$!A-FNe2%4 zQjJ;Y(T0nXCyu)?1*cRti$xhw5bc`LDU#`R>gpByprxDwCAWa3XX){e9Kdu#p@(9u zwov*&cNgj!)EuJ2I+)|tf^gTm<;L%iO8Iq;%;~tVuP+)6-s-1h-zLsaf85qr@0SA} zfTSs-Ruf>YdVATA>WKnITf#z`w>E%q{0$tv5|Ac2TLA$)z)Z!gvI;_DvQE*w!^x;i z+4=GuiT9lI>kr2Bp}Ex?EtI1@dWTk?K%`y&Qc;nWKbk;`|8jFCbkop+6`~nl*yp|# z@BvU0J`kFKCQ$jo>4J6HhJhJotg)oQiCtOY=gtM7*hp3)Y^lh1>Vy*skP^rN>2#tO zurTXCaRM_2&@vPNa8Ahr;xRewD`f=%*(_XlX%r)@!M~1N1QG2SGQayjP0D*`<>syy z-fhPhLlv6BIxfaz40K0M8+ z-}QpzE{yPCHnjWt-mH*ek};OFR>Zm^!aAh;_vVuPt;BUKI%)m0zxB%0(SprvI~OAV zDH9^1kp|YTk?YD;0MHc&lP^2MLT~i-1rIAM%Tv0L*}jL!OfCnxASG)G3dp~f_b1C2 zl*7bEh5w*1@(mpWBMY0A2de(ikhFzCoAfHB@t0@D@9JA%sXBugsw;8R#$QmbTtHRJ z+Tqn_T?T$4%vu$yfThOd`FM#*lR=z~`}&IO#=KQZqGhS)V`*|tk4Oh>F8FVR9$@6R z>Q@n|zj}?d<>df%BcJ2I&rCG^;VB9V)|2KHHU08&a`;J@dsqpq=!-M#=#xM8p*Az@ z`7yAw(&c)5JL|W1z`Hy>@g7`9{p_Sh!Xn1Y6`s>ZAhs_N1EIxn;8S&_G{@vaWTE#x ze=BYK;~nC_P)RkRH~bS}E1@WRYE-VUitPLHh47N%$yx-HxOr;ppirC!$X8Q;{-oNm=89&S z+Vazl-$~2M+sdzRq)yiUmdQe7pvK>v z=*(@wr7O73=#STheqK4yha_^kuN@72Y2*ul;n#exp^^5p9(W-1uEaY=eZ|CZ`Mw;I zamY#59mc{rz{;Sj8t0Jx8FLF_9Y?ATpTcZjIVSl;81BeUC`Vo${5D>4cb(jyn0`c* ztW)^2lZE1W;e757aRNd@rz;wjQ`BfE*6QTku+cAPTj4RO%BbZQQw1{G06uruGp>q5 zs~rdAm9+5BoQ{*Mx3N2g4>|1tW5Vo!l=BWV(jScsi0y-MTO_BlpyK&(pb0$ z&s(gar1|-+urX?N;%RicxgL58a-7Pc)6ZUB%hY%q;Zgo#Z8UzIT++k9Vx_8~v9s%S zDEenALB!3~HO6yYL*J98+M7cc)eiA;WTbYfwx`vDS6#$rJui`ktJkc*sO3YmmK;%4 zNy&tTK!rR#L)Nefx6hr6`6;7}`(5XDR!#LFP0GX54P!1x?~%Z#j8_~vIZ(|1>Q*>M z1aFb59ZC_E?grrgPST_O*vB#^zf4I@Eh{MK(_=vz!kOqchdgWdJV4{}>Z-J|@>d93BiFPP)NNom(u@!y3__stKTTx3c_F65BN&EI zD-ZZfqxo7%rktI)rabNH^9xm)RCIk+)ntt_6@4$Zt_LTm36b&yzMbF7MI4+1mXr&O zEG%O>zfE5C%n$sifNqK%{A>4?MmIq0O!^MV?G4Ur8#T3*RA#MjfNZ6nThJwu&*-`R z`UuE!7lpEBBuq`MG;4ZRT;{6{ck$A?#}+B%6KURIs8~BtHt)G9#*ut6hM+jqZCyba zf{Iia7hkbqIk>ZC*Z_!s=!+of=!C3$1B3HjXc3w{kna}lko6FW3wNBrt9$< ztn)IP#@~5ylWNRN6;^KMe;&@Gq^0UMA!4b{{K0b=Nr=gZXE@1}*9T#y9M8MAsPSq? zK|rU^@oVz&vGR&Wq>9Q72&pVJl$MpjtJtaKy?n6`WsQuCBuzg3{V-c)a6;>y=UU^9 zm}|(4=NyCdc3XlgoXF0-J4vdWrka`X4#KW!go|T#d+zpwS4+UFtt1NyMol7rAK4Xy z-ND?v*vi^kk4I!Wv<1Em7D666KURPNRP>L3{(S1V`1RKF16yB~$Z7maf3J38#E0vl zDR8!4^mwEJ*Yxb{Z2O)yJA~60ofZnqbRRU1R68)6o>g5>t#bbzE+oz#{@`5eT|gycV>GBUwvxWS*pQ6F|j&TLalrG0tz zgGPi-S*odAXB}z%N%TXWj%e2>tfa>$>bzi#d9mQv*f#6hZB!H)@&b66M4Cn@TtmIi ze-Zt^{GOQsM)wvLfGqq?;xt6}ppZW9FE`u!Z3tcdm$wmk!a=b*Iyx(E z>Yc?a6v4;@(sVs!{-PV7*}i~L{`dBk9|yA));EG|!=+8l&L2M}1(HvI5#?XEUrOc* z>FhtoDz#i?2{8``8#u;j)vJS8)W^B8K4gJ`bWss)lj$gote~bW-Gs#3_t3MV8fZ6f zfCO`U+iXtlFFRgrud?jf3b|$Xu()Z6yf66jRu&cxfr~F6mB5Z~i*$=>h-@RI@vSF9 zQ-(R>#C!ajhK3omGdC9(3l|sFv9U3r2yzYMd-y(GtoUWM$8dzUY6eI*=vi5FjRq4- z%#BX9?Vuc+!BJ47UV1ZJ6u>4rB)#qs6`l66=PP$4)GG|qOSEwO=8V3<^X=ijqk^Oy z5pX^`EkjvYH~Wbt?Ra|X`bmNRpnOH5AweaN=jBaJ_`A+R z?yBM|7MH)-@PTl#H@U6xZ-f|M3xW`i7$SUc2oCzLF(&6Qg(ek(BILC%wu|h^j~_pD z1#&uR31f13fLnC*b4*dk&H+&H++aua$*LKZBD6i(6 zYH&(kN9T)+buQ<3wc7p!C7ME^ZESC#Byt)Vf;(so!Y zXXR{$Gw34(irt#T#6&5ah(2OMLV{TSaS!ZXvQ%6c)nQylm_$`jW0A=RdMm)WZ(C6-eLT- ze%3we(S>Wyu*Ae!yE{skiCd%SHQDZu8CRE=CZB5NkvZJ15GuN4Tu(=q4cC`4<5>J4Dh9N-9pdynlO6rGEmN(_z6&o>N1 z=Yj;S0M#z7TDk_^MgMvDqlHhe{a3;Fqlx2j@m#y)2x%Pd?eL@+F%oT7vyHh&P9NH8 z<91}a%sf0inhOd{vU1#4TU^@{_;0K%EzbaLZ1NpDy8|N~5^Cm>xL(W>HC03N8xBlJ z!q@o$)ClxbY95wy>q&8AG*<#XLQK(yQ%rpAM!WQVeu4^x~x0vg4zj3aMS7uHT;gwbE5DtQx^dD;QRVK;eCJ1yt`hK1sP=Rbse?=gq} z)Hu<4rJJbG1xCnzhfe;Q%-0&S*b2-tL}zh#cq3e_xR)4i>;{35o=BWp!)_Y>fNI@a zAt-j~$-md>p5t3iv3aQW6o@cQfhjTtVz#Mlv#D%sogyMWpaWLI?5YDUDRsGPhkQQl9&qpjynsP z^E6gH0Z?lWA$UW(=JVOE2x@U{5odY`2?@no1^>d_B3h3f`*pkV(*V= zP9->h|G?L0TN-L%GszILlI;mt*<|fe<-iZUH%7&#`Kx7XYkTbQXQNy2t20-DXeCUl zh%lTo(z>G{%eWyJA(J>PSyI=F-F@{gYVE!c&-MFMcUApG1f_M%FIo~bjdWLUe40)d&oN~7`HB5Sx~Dc(H`SCT)|q?w zL-k1wb(U3vu-NQDF(iVbF~Rr}V@0+&l!A(FwthY=L{| zwJPh#P-G->*izju(h)qZS~R*;H%Tqi&xEQl00H&o->CWWn6TuOWkfLcMy>VRH4J_G z1w~z43v)x7iE|MHBoq%Glo&`=5{Bas(0=4(H6fpPXkpLT@V;H2?i#qNCP2of8rY!a z*bSEpo3?-R1oh_kU8)nDQO_UfJ}EC`mo2CW4+Cs+ySV)5*-$*io;uNF%ugd-7NYslp}tOLSM&9=pQ^| znMcXuqPBbdQ5msFo{PW{Bc}~yXA(v-_1E#eZz%?{snHA=z-sWaQ*7RM(#of=m#kF> zt*<7yY7Zqb6KHHAW>b((EG+EZ9ZXdI92o(Sx16k4ortmwhN3TRQHuj~SImP^aZ zrhxxKZwi@UW`2IRIr93m6XFmGed!C|)V68G?Jf?eAROHh(X4Dbbnj9$miawc(>^*o z*JY7@Yptf*(j^dl6-1gGHy>(in_TPxL4OZQMW)wCRq7s*+pp6?Zk#EVsU;kqD+>6F zC#;rVRi@OPA<7c4(?x`h(Uov7E-mTJ{uJ+i;IiI z4JZ>~XB>Z6gK)YhU-X=_6*^4|&Jl5PkzjpP)^*y`{sbie1N9*o$0N!CU+I=wCRhyP zBZ0+|I&F26|NdFQrfhwjjEQXn01*wON=?rVkSB9@XMfdm>5x{k5ro$Lu|f`wFt=J} z37sK!v)wpvL%bfbr$Gwy3N8W%h1rm5x+jE3{DJC6+kRQO%j4DDPQQAhSm!vvtQP~c zYiWMIaTINmAC2X}_g|xc}f}ezqF!QypxyB=Y253-Uo(qGQ^HRr7#n5)7gKE>W(DD2jv&8<0g#c?=V)$)Z>7ti;=n1&fucQ%jTI z)n)K9v3y|yzgR`V&6sn&;%>mh$9Dkanq+g~Qqp&;>axEJdZWZxevOikrMZ5Py z0^^iwK}FBM3hOHLHI-Tl4EPqQ7u4lM{xnLA_g@1;HXiwsnBua^_wV7{uI%l;CMMEW z{GJ^h9kE;DJ&5n+yOt>}lQmpOkf8B6Syb`zhQ(4*8Xb0W+^zPe3I*2vA>5y@ZNRXK z1Q;2-wo)|Cqi0l=^JW86E|!AJs1aNhDl|95s0MNyI3U_8P&c1vgt=rAxnaHfzRH6zSOm22NV?0LnK|&S{%o*KS2NfBGUSX9!{> z)pT?Y{?J53%+xh)Q5=)0W9^d@0TGa%UQQB^Q8))^$LxrM;@c4l=_-BC{`9|C>CfG; z)6&uoZUE5uo!{jotCn}u+~h`JG0xbt2F}2>Zu9U#D*F=I$(6NCl8?cwpJ{C)feE%2 zSMi^Sh=}x(5bR}=5GrA*iH9mtPhjeFvY|FABXH=phi~)c-p|vH#_QfC6U(1YR4+6; z8n0e6FeMrue5lnUXXA|SsRDjf3HG;zS`}MeR)r?%4z>WUx zqNED%_n!>C9=X8`>zW0tmS$Qo=xftc8w?Rx{yn@E3D z1uoPTV@;wQpyF~9XqR~xm~ExnHZm(Ig3#+fprr5vn}GQJcS2em$J*xH}q5ep1 z?_}Bgm>7%ve1E6Z>gG58kyjqK>v_!HYV`*Km=|HJZk{}=PhF*?+|B&kDL<_4J%`r` zB6ooAhN%3RimHKq#gB7}j9FTgNghne^-)jnsGB)eEU`d`6>8KNQ;O^|PCGGyc`+wC z>c@NlbAa{Ejx?dnyhW{lNRZUW*CKT=M|C}LN*kl5bLy*9ia0O(ktq z?98wYGcisbxv&0HR7+&4R2rrTi*B?knz@=Ct@fx&GeIW_zzpv056ez}ENRW4rO zG?CgVwGutv?4G2$60o4no+04^rz|i%6llG9OdE*7fnoTv<0|%M( zOsHJT-`qjPX=P=_lS=0Iy&L?hY;w{H%tfuzNUgyksxVyw+WrK9g5Y66zqMsM){lq-!A3(u>{AhG2q$*2>{``277&=!uvu<5wX=3vJ1#5H# z#9ob`Ph2?&mV19a^@aqW|2m{$(aYsnMBBs}#ZM$i`fNxf$Ue-G3&M1Me%>og3-l1I zY;5G^8#l95CkUP%7=5cJB>R@u*mgQZ=T|UeIR4@rhnd}KXjc`gB*dfIpRCVQa4POH zgsoe6Bz_NPSsvL3y^-t5FgMQ@0VDs4X;|cGQ*_%k!6~x{s6GuQ1E^}t9{G|zzy1Oo z+5KvtCx4`_BuMNZh?cdMeai zXDd~{>}lL@c8aNTqP%IPC@utrj*;dFpA<&_OG3R~^VKxXw~hO`3jGR^DS(l2y$nXu zW)~=nY&&*ZV*$)tF#VgH@0RnQsrlgU?!HP<-5r1kpYzMPNqFt8SxX9UvP=BySo!c2*h8TGP7JyA8)Ly4l1XkinG5#zA3*l zqc9I95YeY(WME=wut0?giJ{a|%@`QqwFA)-i%3l5v{_RqPTVcjE_8JVj2Esfp1KJ1n9)1b8f23RY|2|0 za{b($(!4xTQ1QLM>-BxEW*oUrI%slOOBGbyEh|XV9h>dGoOxdL$rh6HU3W2I#5?7a z$uy@^?J>cvV^s;uTBUPJtTxOsW{p`LFSmF}t2}O{l^;%slhn$TfMq3X)&B0TgVR~} zPeeH-l7$>`)FBW*v1LSm=u|{8@R^+NFKB@T3^U~%M08a9&l?A_GF&4+U-@lfNl;?Fm}t`OJH4!}TyFE@1Xf|FR_dqo z8hf3C-=lo87@VGP9N6j|{E7^*30#kwg{b8!+EgF>nP?R)8UD4arl!_XfI*2^9G44y zD{KT=#7+`2X${7Umk7oMtG!jOb|$B3Wakx7ZQdC?YYPK5%vH(B!Cc}KRdoN_ zLbJO4wVhJ@PuW~LxPXUWbDJxl8(seSl9iqbliAS@cmDj+#ma#HPO;T##ne=LZIWX^ z-p<0QSk)*0v()2vnm^R{0{An~2nZ{T&p3nS(C}EuQsNh24%k zkeoe z1Gme)M%UmtF}wYBv}&J0yhr3wfLsA_5L zxoy6}$8S4&y*?ApFEa%sfE90#o5k(h&jy+$eF4?j^x>S{zFBUnwZc1Y;l$WGL`@2_ z=P=x`$&^!@a_>sVZt}P5!8x7{4)2fmP@e0`BIfzH1-J;w#$R5lhnIfDR*8U#iOKnU zzC110tap&zhhoIlw`W7F%p!DQ6teU`ckiklr@i2Hmw*(uJcG-8e^B_TMjsHXSa_ep z{_Q6L$Hz%>>i#c#A32P%?9!IpCW(`?xv|>}1|yl*QT;AJl^MekOx;1dSD3<-lB8-g zd#UXs%=!5iia1ovlq=Lo^2z0M8mVf&z0NKxeaK#IJyoMT|n2 z=xq$b+PzEMAOj@e7peENDSWJ)fX>u(L@;T@;8lf^X6xyUF#FeW1K*ZkHnuZBGHyLH zt!RByRD^NlEKm5E9C*rK0$MKKB_^Zmow4BSajRE`WW0q!%h7t$0tHsCwVs|{ZZz>T zx?PZMx+oMjZ5#v}U_Md})YZ4=Yw*5Ophzi430-ps^H<0(CALtxbz|-U5#kGl$;Sf2 zbqUksUwwh!=d>@w(ydBUhj|o_`|;xShX0&|faA*R`mpY5;q-L7^qcMc*N&Z0;~u;(N-wOS`tc@C>d(DYBV;4gJY~E!o;@ za0_jl+0HJzfpErOYT9%z&;^Fh$SR13Fx; zSOKdfVYVcfF9n%v&-&Af{Gy77&H0&659Vm0nou5HllP90x0{f{!ot`Q^b34DI0r$8 z+MK%j@VvO1;l<$r%jcn8g_k>J`?#a-$5@e|w4tp<}v8 zT*Rx#&@w;kv>yLtm~-D}TGy{-*<1B96z}HY>rZ@P?NF8I>_Vz_-&XW1TQMJKK!x7U*fbF+l)+{SjBq{w^Lh@C=j1As`^@QWZ8>=XMW`NJT}xGX z!796I$JqeUiL7u^fsJcJW>%K#S=~6}#qWHIuI~l|QhWfPcKWtz~xrA!mA^ zZ8t8#McqaEyAQeYw12Pf#omfp2Avl)Hmawjq$reEm6b6n?vKg#_g=TG2cj%P9&{{R z^arI|{|U*q{i+sP!iuoCzTCUp@J7v4sBn2N`joCx`Dmtc;> z&dly7eR(LL-ZPacC3~c|k5BzhrV@Q}uQ2#pHI5S-24mD9nDsSNZ<|hNbrT4pF$6_k zOiYYjY^6gRO(8sqP#b!R@ZT6qeRfh_kUjybIFO{`heQ0F5HDR*Nbdul0|3P{liZdn z?kxbw-rPyEvFg(oF+U zEPsWij=p1Mc;{J5%dA~s?{~k{x|93a<$FPuM1GleO-~3+$v-Fwx9y(Tq)9drlF`bF z!B7iUuAdnoxK3wSeV*~MP%E-e6T1u5EQ*Bz3V%r8sPSdLRiRlU7UsSGF)}3M0g{Lp zZTxT~W_1lCgLZO$3Pu{PFA(nS>^FDgR|hk-Rw*lelbm+Y3gpEo!gmRs+R7Y7W<0;FK`)vq;990~bmVncT8ta>o_7h8 zi3aW6S+JxE!%M;*$<4Sk2??VDb$u`TTW<@5_4)}2&*+yEY9ripTxtgF#_&mVf3fkg zLS_WFuvepZTJ%Q5vEbFbc}u>`X|(wfc~Z68C&~2O%q^Q}5eq6o&pK0~n4}CYkX|ND z&n@HETL5=+ShDq^M8s_$7vDcRnBG9avpD(ktox<&$*TcGuSC7OX>k`qYjYhptL4SHUb0{bdXd`O`1mMrmu_7D^SI6W{A}=`>^(=+!0>@6HVsd56Nr|zR&8ex)&W+$mGbhUMfqy;K9 zHqr`s)Bk&?mlqp!9@ja6E#+{C%Jm^HY##v>0&zZv#^~BC%u@fX`}DayZo}#Q&MKvtphv^VPFItEX=WiI@G6k_k2HgYEU{PMB>l8uiu?~IY1+I-_hGLuR-lca1dXLIe*&e#4 z028>M!sL22l9CA+fwhTGLRo57Pu?Jo%RUM<=;DLEdk$dr3dhLp#!~~-|G*d)?~WSn z-s)*}3g91q10Wzk9syf3e)~_JVz=Wb{hy38ycFZCOOw86oyoiS?=Azjo?r}|7=H>R znuR-1#M!4!Aa`;4c&(0;ni!MUwwp0e!t&<6hB*R#rUCq(htA^+j(=kW%!qHVIxy=> z3Wj`cO5L_(XL20^CB-_rn5x=U4DJ`_aHTWXmdbU&8CbV=V{RnQ$YY!N4pgOCr$}-% zk7P2PJEbm5wrgsN>mB+y;_Rg(H!02QFltZh2q5?k@XCFY@b78%rm7Vw*EH@i{7PyE zB+VhXgG!POjiRy$1DKbcV7)O%Ush28a^Rd9x0sR1K=o%o*Y(FLeNmLH7;ODpUf%{L z6N2ToU3i@m3`wYiAnBajl5KIGj=h@qxrxxjY44(0maWUr&EdQ6JA3h`(1PD}15lyj@lQHgWVzbA1FOAlmS7vkm7I$Oi=bf;rD+v{$ER8584yUpMC$pT%ly|e^WQ;kT9%9S zf{aAQt|!-5!cWcm-g`7T4n0UOBjSM^ZS?4~y>zb)I5D_>mE9vR&-qTE$%*Avm_m^5 zGY!Spl>T?2@3mLh&HAano=u5*HioNhoS8ybY+a^E`)~@8S|wh%9IR2m=P4NnGDz#) zJ{&dI`=kB+{V9Mrpi!KPQ+WFUA=@DkC`>M|a1?)28POdpCT4!|QD4ApmCWxdDUn9O zV|MtSZ!g>WiAk;@eFp@fPB_r3G|*H*dL}00<@fuKn&w7k$_Ht(+t&`TWG1EGH?XzG z^PP!*8p|8x1x1wtNw5k$NAnzpcOQ%ggCcn>%xDn+O8@_-$? z3~_QT=Hy(EJ}kJVVK%3ycg$`&f(w`Ut8Jh0i0^ZwIxxZz*|&WtPi39C42375u)MAA zU2YeoPI+;HdM4K~_1<>!RBez?_$$+_CC-U&P&~Ryh2aTbjHY{+^h@`+sf?~$UI1h z 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.tech https://mokoconsulting.tech 02.34.08-dev - MokoWaaS core system plugin — coordinates feature plugins, master user management, event routing, and admin customizations. + MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations. Moko\Plugin\System\MokoWaaS script.php @@ -40,7 +40,6 @@ Extension Field Helper - Service forms payload services @@ -48,14 +47,6 @@ administrator - - index.html - favicon.ico - favicon.svg - favicon_256.png - logo.png - - en-GB/plg_system_mokowaas.ini en-US/plg_system_mokowaas.ini @@ -89,42 +80,6 @@ readonly="true" /> -
              - -
              -
              - - - - - - -
              From 3d5f9346c6f8997bc1e004a6edbc16a0b9aca99d Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 06:04:35 -0500 Subject: [PATCH 189/220] chore: bump version to 02.34.09-dev Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 4 ++-- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 4 ++-- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 42 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 30071859..0bba6afb 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.34.08 + 02.34.09 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index ab1b8c1a..8f7fd672 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.34.08 +# VERSION: 02.34.09 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index c6336fc9..2e9c6234 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.34.08 + VERSION: 02.34.09 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index c1a0c1dd..db174a57 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 9c6a79e8..d831dac1 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 2c84ec0b..903dc7e4 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.34.08 + VERSION: 02.34.09 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 1ba0581a..d741e62f 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 53bb8ac9..ae51cc30 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.34.08 +VERSION: 02.34.09 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index d2b7edf5..bd7da257 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.34.08) +# MokoWaaS Build Guide (VERSION: 02.34.09) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index edf89e85..3df82ab7 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.34.08) +# MokoWaaS Configuration Guide (VERSION: 02.34.09) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 18eee009..d11d6e9a 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.34.08) +# MokoWaaS Installation Guide (VERSION: 02.34.09) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 6e320c83..ddffe852 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.34.08) +# MokoWaaS Operations Guide (VERSION: 02.34.09) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d8de58a6..ed93883b 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.08) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.09) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index ad2e6ca9..428abc70 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.34.08) +# MokoWaaS Testing Guide (VERSION: 02.34.09) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 87a15cb2..a99095ed 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.34.08) +# MokoWaaS Troubleshooting Guide (VERSION: 02.34.09) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index f3ef938b..736c8857 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.08) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.09) ## Introduction diff --git a/docs/index.md b/docs/index.md index b29b73de..b95bc976 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.08 + VERSION: 02.34.09 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.34.08) +# MokoWaaS Documentation Index (VERSION: 02.34.09) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 8dee650c..72143e1f 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.34.08 + VERSION: 02.34.09 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.34.08) +# MokoWaaS Plugin Overview (VERSION: 02.34.09) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index c0d2add7..cb169d5e 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.34.08 +VERSION: 02.34.09 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index a1f12e1c..47a83e41 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -8,7 +8,7 @@ DEFGROUP: Joomla.Component INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.00 + VERSION: 02.34.09 PATH: /mokowaas.xml BRIEF: Component manifest for MokoWaaS admin dashboard and REST API --> @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index dfcaff94..3c52d3f4 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index cbefb86e..c1a77100 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 4a2fbb16..b3ca2bad 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index e1779482..29ba0b5f 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.08 + * VERSION: 02.34.09 * PATH: /src/Extension/MokoWaaS.php * NOTE: Core system plugin for MokoWaaS admin tools suite */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 0106b1f8..8ad7e4a6 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.08 + * VERSION: 02.34.09 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index d0fac4af..e553d699 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -16,7 +16,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.00 + VERSION: 02.34.09 PATH: /src/mokowaas.xml BRIEF: Plugin manifest for MokoWaaS system plugin NOTE: Defines installation metadata, files, and configuration for Joomla @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index a44f91b7..a024ce07 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.08 + * VERSION: 02.34.09 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index e2c0bc7b..54117efe 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.08 + * VERSION: 02.34.09 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 797037c7..a8e4bd2b 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index 0a8a24a9..d023035b 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 3377c28e..902beeb2 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 3b04f941..3b53402b 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 6b4225d0..c32047d7 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index b20640d8..bd1111b0 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 50d468c4..02b5b789 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index a062e2f5..4155edf9 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 084d9dd9..539e2b39 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index 092f2b1c..d02c4436 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.08-dev + 02.34.09 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index a1d816a5..2ac79bad 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.34.08 + * VERSION: 02.34.09 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index e227ad72..8be62017 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.34.08 + * VERSION: 02.34.09 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index b171df0f..6cb4dd6e 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.08-dev + 02.34.09 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index c8b32eed..8695348f 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 79047e37b56e991eaff019bcc8a38a37f5f4f871 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 06:08:03 -0500 Subject: [PATCH 190/220] chore: bump version to 02.34.10-dev Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 4 ++-- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- src/packages/plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 4 ++-- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 2 +- 42 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 0bba6afb..74196251 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.34.09 + 02.34.10 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 8f7fd672..83d325ea 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.34.09 +# VERSION: 02.34.10 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index 2e9c6234..a18194e3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.34.09 + VERSION: 02.34.10 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index db174a57..f312a7bf 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index d831dac1..2c0fd007 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 903dc7e4..6e96660d 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.34.09 + VERSION: 02.34.10 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index d741e62f..30546cc8 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index ae51cc30..7fc8c56d 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.34.09 +VERSION: 02.34.10 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index bd7da257..e991d93c 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.34.09) +# MokoWaaS Build Guide (VERSION: 02.34.10) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index 3df82ab7..ec4227a2 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.34.09) +# MokoWaaS Configuration Guide (VERSION: 02.34.10) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index d11d6e9a..9e8e908b 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.34.09) +# MokoWaaS Installation Guide (VERSION: 02.34.10) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index ddffe852..8c6c5955 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.34.09) +# MokoWaaS Operations Guide (VERSION: 02.34.10) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index ed93883b..c7244400 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.09) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.10) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 428abc70..b82cfebe 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.34.09) +# MokoWaaS Testing Guide (VERSION: 02.34.10) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index a99095ed..27b9a6c4 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.34.09) +# MokoWaaS Troubleshooting Guide (VERSION: 02.34.10) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 736c8857..f84a6269 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.09) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.10) ## Introduction diff --git a/docs/index.md b/docs/index.md index b95bc976..9f5fb08b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.34.09) +# MokoWaaS Documentation Index (VERSION: 02.34.10) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index 72143e1f..ff07ea32 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.34.09 + VERSION: 02.34.10 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.34.09) +# MokoWaaS Plugin Overview (VERSION: 02.34.10) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index cb169d5e..b1f3db8b 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.34.09 +VERSION: 02.34.10 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 47a83e41..543319f0 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -8,7 +8,7 @@ DEFGROUP: Joomla.Component INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /mokowaas.xml BRIEF: Component manifest for MokoWaaS admin dashboard and REST API --> @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index 3c52d3f4..49ef106a 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index c1a77100..e317d503 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index b3ca2bad..4468dfe3 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 29ba0b5f..24eafc1b 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.09 + * VERSION: 02.34.10 * PATH: /src/Extension/MokoWaaS.php * NOTE: Core system plugin for MokoWaaS admin tools suite */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 8ad7e4a6..1a16edee 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.09 + * VERSION: 02.34.10 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index e553d699..8fed1343 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -16,7 +16,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.09 + VERSION: 02.34.10 PATH: /src/mokowaas.xml BRIEF: Plugin manifest for MokoWaaS system plugin NOTE: Defines installation metadata, files, and configuration for Joomla @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index a024ce07..7ba04261 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.09 + * VERSION: 02.34.10 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 54117efe..064f3300 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.09 + * VERSION: 02.34.10 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index a8e4bd2b..4934fa7d 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index d023035b..f567ca58 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 902beeb2..1e3f472f 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index 3b53402b..c6298c6c 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index c32047d7..0a6552fc 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index bd1111b0..52a73686 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 02b5b789..4119b3d6 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 4155edf9..b5bc18cc 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 539e2b39..2fece6ee 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index d02c4436..a634fa49 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.09 + 02.34.10 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 2ac79bad..4a7e3d03 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.34.09 + * VERSION: 02.34.10 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 8be62017..5bfb55e2 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.34.09 + * VERSION: 02.34.10 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 6cb4dd6e..cab7478c 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.09 + 02.34.10 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 8695348f..445c4ca0 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ From 7f9b59a36d9fe4adfd3d6376d0a3b76aa6029aa5 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 06:21:50 -0500 Subject: [PATCH 191/220] chore: update updates.xml for 02.34.10-dev Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- updates.xml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/updates.xml b/updates.xml index 445c4ca0..68e87ac7 100644 --- a/updates.xml +++ b/updates.xml @@ -11,13 +11,12 @@ pkg_mokowaas package site - 02.34.02-dev - 2026-06-04 + 02.34.10-dev + 2026-06-06 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.34.02-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.34.10-dev.zip - 16cd0c7cef22b6f260fb921767a841839d7060cd39fb11b402e9a96f217e7810 dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md Moko Consulting From d1ee2ef3f44125882d149f86905204eb2b7a5954 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 06:25:18 -0500 Subject: [PATCH 192/220] fix: API controller execute() signatures compatible with BaseController (#183) All API controllers now accept the $task parameter required by Joomla\CMS\MVC\Controller\BaseController::execute($task). Closes #183 Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../com_mokowaas/api/src/Controller/CacheController.php | 2 +- .../com_mokowaas/api/src/Controller/InstallController.php | 2 +- .../com_mokowaas/api/src/Controller/PluginsController.php | 2 +- .../com_mokowaas/api/src/Controller/ResetController.php | 2 +- .../com_mokowaas/api/src/Controller/SnapshotController.php | 2 +- src/packages/com_mokowaas/api/src/Controller/SyncController.php | 2 +- .../com_mokowaas/api/src/Controller/SyncReceiveController.php | 2 +- .../com_mokowaas/api/src/Controller/UpdateController.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/packages/com_mokowaas/api/src/Controller/CacheController.php b/src/packages/com_mokowaas/api/src/Controller/CacheController.php index 8b4a4f44..f5e25409 100644 --- a/src/packages/com_mokowaas/api/src/Controller/CacheController.php +++ b/src/packages/com_mokowaas/api/src/Controller/CacheController.php @@ -29,7 +29,7 @@ class CacheController extends BaseController * * @since 1.0.0 */ - public function execute(): void + public function execute($task = 'cache'): void { $app = Factory::getApplication(); diff --git a/src/packages/com_mokowaas/api/src/Controller/InstallController.php b/src/packages/com_mokowaas/api/src/Controller/InstallController.php index 8b36c42a..e408fe46 100644 --- a/src/packages/com_mokowaas/api/src/Controller/InstallController.php +++ b/src/packages/com_mokowaas/api/src/Controller/InstallController.php @@ -42,7 +42,7 @@ class InstallController extends BaseController * * @since 02.21.00 */ - public function execute(): void + public function execute($task = 'install'): void { $app = Factory::getApplication(); diff --git a/src/packages/com_mokowaas/api/src/Controller/PluginsController.php b/src/packages/com_mokowaas/api/src/Controller/PluginsController.php index a0b84be2..cfc9788a 100644 --- a/src/packages/com_mokowaas/api/src/Controller/PluginsController.php +++ b/src/packages/com_mokowaas/api/src/Controller/PluginsController.php @@ -104,7 +104,7 @@ class PluginsController extends BaseController * * @return void */ - public function execute(): void + public function execute($task = 'plugins'): void { $app = Factory::getApplication(); $user = $app->getIdentity(); diff --git a/src/packages/com_mokowaas/api/src/Controller/ResetController.php b/src/packages/com_mokowaas/api/src/Controller/ResetController.php index 0f80f5e2..5f63a63c 100644 --- a/src/packages/com_mokowaas/api/src/Controller/ResetController.php +++ b/src/packages/com_mokowaas/api/src/Controller/ResetController.php @@ -35,7 +35,7 @@ class ResetController extends BaseController * * @since 02.21.00 */ - public function execute(): void + public function execute($task = 'reset'): void { $app = Factory::getApplication(); diff --git a/src/packages/com_mokowaas/api/src/Controller/SnapshotController.php b/src/packages/com_mokowaas/api/src/Controller/SnapshotController.php index 0046fac0..49a9e511 100644 --- a/src/packages/com_mokowaas/api/src/Controller/SnapshotController.php +++ b/src/packages/com_mokowaas/api/src/Controller/SnapshotController.php @@ -68,7 +68,7 @@ class SnapshotController extends BaseController * * @since 02.21.00 */ - public function execute(): void + public function execute($task = 'snapshot'): void { $app = Factory::getApplication(); diff --git a/src/packages/com_mokowaas/api/src/Controller/SyncController.php b/src/packages/com_mokowaas/api/src/Controller/SyncController.php index 3e89f09c..fcc2391f 100644 --- a/src/packages/com_mokowaas/api/src/Controller/SyncController.php +++ b/src/packages/com_mokowaas/api/src/Controller/SyncController.php @@ -26,7 +26,7 @@ use Joomla\Registry\Registry; */ class SyncController extends BaseController { - public function execute(): void + public function execute($task = 'sync'): void { $app = Factory::getApplication(); diff --git a/src/packages/com_mokowaas/api/src/Controller/SyncReceiveController.php b/src/packages/com_mokowaas/api/src/Controller/SyncReceiveController.php index 60a734db..2adc5608 100644 --- a/src/packages/com_mokowaas/api/src/Controller/SyncReceiveController.php +++ b/src/packages/com_mokowaas/api/src/Controller/SyncReceiveController.php @@ -24,7 +24,7 @@ use Joomla\CMS\MVC\Controller\BaseController; */ class SyncReceiveController extends BaseController { - public function execute(): void + public function execute($task = 'syncReceive'): void { $app = Factory::getApplication(); diff --git a/src/packages/com_mokowaas/api/src/Controller/UpdateController.php b/src/packages/com_mokowaas/api/src/Controller/UpdateController.php index d74e9c2f..bb48efba 100644 --- a/src/packages/com_mokowaas/api/src/Controller/UpdateController.php +++ b/src/packages/com_mokowaas/api/src/Controller/UpdateController.php @@ -29,7 +29,7 @@ class UpdateController extends BaseController * * @since 1.0.0 */ - public function execute(): void + public function execute($task = 'update'): void { $app = Factory::getApplication(); From 082fa0798cd10e7af59cf0136ac3d4d670b1ad9f Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 06:34:17 -0500 Subject: [PATCH 193/220] feat: add auto-category menu module for knowledge base sections (#184) New module mod_mokowaas_categories auto-discovers article categories from a configurable root and renders them as a collapsible sidebar tree. Supports configurable depth, article counts, empty category filtering, and ACL-aware access. Matches existing MokoWaaS sidebar styling. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../en-GB/mod_mokowaas_categories.ini | 24 +++ .../en-GB/mod_mokowaas_categories.sys.ini | 2 + .../mod_mokowaas_categories.xml | 76 +++++++++ .../services/provider.php | 25 +++ .../src/Dispatcher/Dispatcher.php | 32 ++++ .../src/Helper/CategoriesHelper.php | 148 ++++++++++++++++++ .../mod_mokowaas_categories/tmpl/default.php | 138 ++++++++++++++++ src/pkg_mokowaas.xml | 1 + 8 files changed, 446 insertions(+) create mode 100644 src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.ini create mode 100644 src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.sys.ini create mode 100644 src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml create mode 100644 src/packages/mod_mokowaas_categories/services/provider.php create mode 100644 src/packages/mod_mokowaas_categories/src/Dispatcher/Dispatcher.php create mode 100644 src/packages/mod_mokowaas_categories/src/Helper/CategoriesHelper.php create mode 100644 src/packages/mod_mokowaas_categories/tmpl/default.php diff --git a/src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.ini b/src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.ini new file mode 100644 index 00000000..e01d1dc4 --- /dev/null +++ b/src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.ini @@ -0,0 +1,24 @@ +MOD_MOKOWAAS_CATEGORIES="MokoWaaS Categories" +MOD_MOKOWAAS_CATEGORIES_DESC="Auto-discovers article categories and renders them as a collapsible tree menu. Ideal for knowledge base and help sections." + +MOD_MOKOWAAS_CATEGORIES_ROOT_LABEL="Root Category" +MOD_MOKOWAAS_CATEGORIES_ROOT_DESC="Select a parent category. Only its children (and their subcategories) will be displayed. Leave as All to show the entire category tree." +MOD_MOKOWAAS_CATEGORIES_ALL_CATEGORIES="- All Categories -" + +MOD_MOKOWAAS_CATEGORIES_DEPTH_LABEL="Maximum Depth" +MOD_MOKOWAAS_CATEGORIES_DEPTH_DESC="How many levels deep to display. 1 shows only top-level categories, 2 adds one level of subcategories, etc." + +MOD_MOKOWAAS_CATEGORIES_COUNT_LABEL="Show Article Count" +MOD_MOKOWAAS_CATEGORIES_COUNT_DESC="Display the number of published articles next to each category name." + +MOD_MOKOWAAS_CATEGORIES_EMPTY_LABEL="Show Empty Categories" +MOD_MOKOWAAS_CATEGORIES_EMPTY_DESC="Display categories that have no published articles. Only applies when Show Article Count is enabled." + +MOD_MOKOWAAS_CATEGORIES_MENUITEM_LABEL="Target Menu Item" +MOD_MOKOWAAS_CATEGORIES_MENUITEM_DESC="The menu item to use as the base for category links. This sets the Itemid parameter for proper template and menu highlighting." + +MOD_MOKOWAAS_CATEGORIES_ORDER_LABEL="Category Ordering" +MOD_MOKOWAAS_CATEGORIES_ORDER_DESC="How to sort categories within each level." +MOD_MOKOWAAS_CATEGORIES_ORDER_TREE="Tree Order (default)" +MOD_MOKOWAAS_CATEGORIES_ORDER_TITLE="Alphabetical" +MOD_MOKOWAAS_CATEGORIES_ORDER_CREATED="Date Created" diff --git a/src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.sys.ini b/src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.sys.ini new file mode 100644 index 00000000..4338989f --- /dev/null +++ b/src/packages/mod_mokowaas_categories/language/en-GB/mod_mokowaas_categories.sys.ini @@ -0,0 +1,2 @@ +MOD_MOKOWAAS_CATEGORIES="MokoWaaS Categories" +MOD_MOKOWAAS_CATEGORIES_DESC="Auto-discovers article categories and renders them as a collapsible tree menu. Ideal for knowledge base and help sections." diff --git a/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml b/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml new file mode 100644 index 00000000..4fefebe0 --- /dev/null +++ b/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml @@ -0,0 +1,76 @@ + + + mod_mokowaas_categories + Moko Consulting + 2026-06-06 + Copyright (C) 2026 Moko Consulting. All rights reserved. + GPL-3.0-or-later + hello@mokoconsulting.tech + https://mokoconsulting.tech + 02.34.10-dev + MOD_MOKOWAAS_CATEGORIES_DESC + Moko\Module\MokoWaaSCategories + + + services + src + tmpl + + + + en-GB/mod_mokowaas_categories.ini + en-GB/mod_mokowaas_categories.sys.ini + + + + +
              + + + + + + + + + + + + + + + + + + +
              +               +               +               diff --git a/src/packages/mod_mokowaas_categories/services/provider.php b/src/packages/mod_mokowaas_categories/services/provider.php new file mode 100644 index 00000000..0ef768ba --- /dev/null +++ b/src/packages/mod_mokowaas_categories/services/provider.php @@ -0,0 +1,25 @@ +registerServiceProvider(new ModuleDispatcherFactory('\\Moko\\Module\\MokoWaaSCategories')); + $container->registerServiceProvider(new HelperFactory('\\Moko\\Module\\MokoWaaSCategories\\Administrator\\Helper')); + $container->registerServiceProvider(new Module()); + } +}; diff --git a/src/packages/mod_mokowaas_categories/src/Dispatcher/Dispatcher.php b/src/packages/mod_mokowaas_categories/src/Dispatcher/Dispatcher.php new file mode 100644 index 00000000..07857915 --- /dev/null +++ b/src/packages/mod_mokowaas_categories/src/Dispatcher/Dispatcher.php @@ -0,0 +1,32 @@ +getHelperFactory()->getHelper('CategoriesHelper'); + + $data['categories'] = $helper->getCategories($params); + + return $data; + } +} diff --git a/src/packages/mod_mokowaas_categories/src/Helper/CategoriesHelper.php b/src/packages/mod_mokowaas_categories/src/Helper/CategoriesHelper.php new file mode 100644 index 00000000..c33da3ec --- /dev/null +++ b/src/packages/mod_mokowaas_categories/src/Helper/CategoriesHelper.php @@ -0,0 +1,148 @@ +get(DatabaseInterface::class); + + $rootId = (int) $params->get('root_category', 0); + $maxDepth = (int) $params->get('max_depth', 3); + $showEmpty = (int) $params->get('show_empty', 0); + $showCount = (int) $params->get('show_article_count', 1); + $ordering = $params->get('ordering', 'lft'); + $user = Factory::getApplication()->getIdentity(); + $accessLevels = $user->getAuthorisedViewLevels(); + + // Build base query + $query = $db->getQuery(true) + ->select([ + $db->quoteName('c.id'), + $db->quoteName('c.title'), + $db->quoteName('c.alias'), + $db->quoteName('c.parent_id'), + $db->quoteName('c.level'), + $db->quoteName('c.lft'), + $db->quoteName('c.rgt'), + $db->quoteName('c.description'), + ]) + ->from($db->quoteName('#__categories', 'c')) + ->where($db->quoteName('c.extension') . ' = ' . $db->quote('com_content')) + ->where($db->quoteName('c.published') . ' = 1') + ->whereIn($db->quoteName('c.access'), $accessLevels); + + // If a root category is set, constrain to its subtree + if ($rootId > 0) + { + $rootQuery = $db->getQuery(true) + ->select([$db->quoteName('lft'), $db->quoteName('rgt'), $db->quoteName('level')]) + ->from($db->quoteName('#__categories')) + ->where($db->quoteName('id') . ' = ' . $rootId); + $db->setQuery($rootQuery); + $root = $db->loadObject(); + + if (!$root) + { + return []; + } + + $query->where($db->quoteName('c.lft') . ' > ' . (int) $root->lft) + ->where($db->quoteName('c.rgt') . ' < ' . (int) $root->rgt) + ->where($db->quoteName('c.level') . ' <= ' . ((int) $root->level + $maxDepth)); + } + else + { + // No root — show from level 1 (skip the virtual root) + $query->where($db->quoteName('c.level') . ' >= 1') + ->where($db->quoteName('c.level') . ' <= ' . $maxDepth); + } + + // Article count subquery + if ($showCount) + { + $countSub = $db->getQuery(true) + ->select('COUNT(*)') + ->from($db->quoteName('#__content', 'a')) + ->where($db->quoteName('a.catid') . ' = ' . $db->quoteName('c.id')) + ->where($db->quoteName('a.state') . ' = 1'); + $query->select('(' . $countSub . ') AS ' . $db->quoteName('article_count')); + } + + // Ordering + $validOrders = ['lft', 'title', 'created_time']; + $orderCol = \in_array($ordering, $validOrders, true) ? $ordering : 'lft'; + $query->order($db->quoteName('c.' . $orderCol) . ' ASC'); + + $db->setQuery($query); + $categories = $db->loadObjectList() ?: []; + + // Filter empty categories if configured + if (!$showEmpty && $showCount) + { + $categories = array_filter($categories, function ($cat) { + return (int) $cat->article_count > 0; + }); + $categories = array_values($categories); + } + + // Build nested tree + return $this->buildTree($categories, $rootId); + } + + /** + * Build a nested tree from a flat list of categories. + * + * @param array $categories Flat list of category objects + * @param int $rootId Root category ID (0 for all) + * + * @return array Nested array with 'children' key on each node + */ + private function buildTree(array $categories, int $rootId): array + { + $map = []; + $tree = []; + + foreach ($categories as $cat) + { + $cat->children = []; + $map[$cat->id] = $cat; + } + + foreach ($categories as $cat) + { + $parentId = (int) $cat->parent_id; + + if (isset($map[$parentId])) + { + $map[$parentId]->children[] = $cat; + } + else + { + $tree[] = $cat; + } + } + + return $tree; + } +} diff --git a/src/packages/mod_mokowaas_categories/tmpl/default.php b/src/packages/mod_mokowaas_categories/tmpl/default.php new file mode 100644 index 00000000..81745845 --- /dev/null +++ b/src/packages/mod_mokowaas_categories/tmpl/default.php @@ -0,0 +1,138 @@ +get('show_article_count', 1)); +$menuItemId = (int) $params->get('menu_item_id', 0); + +if (empty($categories)) +{ + return; +} + +// Detect active category from current URL +$app = \Joomla\CMS\Factory::getApplication(); +$activeCatId = (int) $app->input->getInt('id', 0); +$currentView = $app->input->getCmd('view', ''); +$isCatView = \in_array($currentView, ['category', 'categories'], true); + +/** + * Build the link for a category. + */ +$buildLink = function (object $cat) use ($menuItemId): string { + $link = 'index.php?option=com_content&view=category&id=' . (int) $cat->id; + + if ($menuItemId) + { + $link .= '&Itemid=' . $menuItemId; + } + + return Route::_($link); +}; + +/** + * Check if a category or any of its descendants is the active category. + */ +$isActiveOrAncestor = function (object $cat) use ($activeCatId, $isCatView, &$isActiveOrAncestor): bool { + if (!$isCatView || !$activeCatId) + { + return false; + } + + if ((int) $cat->id === $activeCatId) + { + return true; + } + + foreach ($cat->children as $child) + { + if ($isActiveOrAncestor($child)) + { + return true; + } + } + + return false; +}; + +/** + * Render a category list recursively. + */ +$renderTree = function (array $categories, int $depth = 1) use ( + &$renderTree, $buildLink, $isActiveOrAncestor, $showCount, $activeCatId, $isCatView +): void { + foreach ($categories as $cat): + $hasChildren = !empty($cat->children); + $isActive = $isCatView && (int) $cat->id === $activeCatId; + $isAncestor = $hasChildren && $isActiveOrAncestor($cat); + $liClass = 'item mokowaas-cat-item mokowaas-cat-level-' . $depth; + + if ($isActive) + { + $liClass .= ' mm-active'; + } + + if ($hasChildren) + { + $liClass .= ' parent'; + } + + $aClass = ($hasChildren ? 'has-arrow' : 'no-dropdown'); + + if ($isActive) + { + $aClass .= ' mm-active'; + } + + $collapseClass = 'collapse-cat-level-' . ($depth + 1) . ' mm-collapse'; + + if ($isAncestor || $isActive) + { + $collapseClass .= ' mm-show'; + } + + $count = isset($cat->article_count) ? (int) $cat->article_count : 0; + ?> +
            • + > + + title); ?> + + + + + +
                + children, $depth + 1); ?> +
              + +
              • + + + + +
                + +
              diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index cab7478c..0608b897 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -24,6 +24,7 @@ mod_mokowaas_cpanel.zip mod_mokowaas_menu.zip mod_mokowaas_cache.zip + mod_mokowaas_categories.zip plg_webservices_mokowaas.zip plg_webservices_perfectpublisher.zip plg_task_mokowaasdemo.zip From b1708942282ca9c0a938f33510450ea3465462d9 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 06:37:21 -0500 Subject: [PATCH 194/220] chore: bump version to 02.34.11-dev, update updates.xml Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 4 ++-- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- .../mod_mokowaas_categories/mod_mokowaas_categories.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- .../plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 4 ++-- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- .../plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- .../plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 6 +++--- 43 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 74196251..b2958e9d 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.34.10 + 02.34.11 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 83d325ea..3727ddef 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.34.10 +# VERSION: 02.34.11 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index a18194e3..ed43f4df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.34.10 + VERSION: 02.34.11 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index f312a7bf..f53d56bd 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 2c0fd007..21261322 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 6e96660d..e83e7882 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.34.10 + VERSION: 02.34.11 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index 30546cc8..27f4bb01 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index 7fc8c56d..13c7f4db 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.34.10 +VERSION: 02.34.11 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index e991d93c..c70dd79a 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.34.10) +# MokoWaaS Build Guide (VERSION: 02.34.11) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index ec4227a2..b2b2eb90 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.34.10) +# MokoWaaS Configuration Guide (VERSION: 02.34.11) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 9e8e908b..808ef180 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.34.10) +# MokoWaaS Installation Guide (VERSION: 02.34.11) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 8c6c5955..b2e16c26 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.34.10) +# MokoWaaS Operations Guide (VERSION: 02.34.11) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index c7244400..24468540 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.10) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.11) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index b82cfebe..8a671ced 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.34.10) +# MokoWaaS Testing Guide (VERSION: 02.34.11) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 27b9a6c4..6eb31893 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.34.10) +# MokoWaaS Troubleshooting Guide (VERSION: 02.34.11) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index f84a6269..e912a7a2 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.10) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.11) ## Introduction diff --git a/docs/index.md b/docs/index.md index 9f5fb08b..d59fbffe 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.34.10) +# MokoWaaS Documentation Index (VERSION: 02.34.11) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index ff07ea32..902668c7 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.34.10 + VERSION: 02.34.11 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.34.10) +# MokoWaaS Plugin Overview (VERSION: 02.34.11) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index b1f3db8b..aff1622e 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.34.10 +VERSION: 02.34.11 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 543319f0..e3212316 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -8,7 +8,7 @@ DEFGROUP: Joomla.Component INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /mokowaas.xml BRIEF: Component manifest for MokoWaaS admin dashboard and REST API --> @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index 49ef106a..82911ca6 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml b/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml index 4fefebe0..b7bf74d0 100644 --- a/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml +++ b/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10-dev + 02.34.11 MOD_MOKOWAAS_CATEGORIES_DESC Moko\Module\MokoWaaSCategories diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index e317d503..1c05bb41 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 4468dfe3..3cebf740 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index 24eafc1b..e9f676ea 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.10 + * VERSION: 02.34.11 * PATH: /src/Extension/MokoWaaS.php * NOTE: Core system plugin for MokoWaaS admin tools suite */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index 1a16edee..594a33fd 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.10 + * VERSION: 02.34.11 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 8fed1343..7a9e0a61 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -16,7 +16,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.10 + VERSION: 02.34.11 PATH: /src/mokowaas.xml BRIEF: Plugin manifest for MokoWaaS system plugin NOTE: Defines installation metadata, files, and configuration for Joomla @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 7ba04261..166436f1 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.10 + * VERSION: 02.34.11 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 064f3300..08bb7fba 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.10 + * VERSION: 02.34.11 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 4934fa7d..1092acbe 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index f567ca58..740a8af1 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 1e3f472f..849bfcee 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index c6298c6c..45be8799 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index 0a6552fc..3753f353 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index 52a73686..db2aa1cd 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 4119b3d6..ea036d6b 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index b5bc18cc..22e516a0 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 2fece6ee..67100604 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index a634fa49..d9488909 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.10 + 02.34.11 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index 4a7e3d03..46481ee0 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.34.10 + * VERSION: 02.34.11 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index 5bfb55e2..3245dfb2 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.34.10 + * VERSION: 02.34.11 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index 0608b897..d58d40a8 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.10 + 02.34.11 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 68e87ac7..b84c6531 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -11,11 +11,11 @@ pkg_mokowaas package site - 02.34.10-dev + 02.34.11-dev 2026-06-06 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.34.10-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.34.11-dev.zip dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md From 0fb82306bb2efb597e0400f4364f31828f7fcd18 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 06:49:52 -0500 Subject: [PATCH 195/220] feat: XML-based extension catalog with update server discovery (#186) Replace hardcoded CATALOG constant with catalog.xml that points to each extension's updates.xml. The model fetches update servers at runtime to resolve latest version and download URL. Adds update_available status with Update button in the extensions view. Closes #186 Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- src/packages/com_mokowaas/admin/catalog.xml | 92 +++++ .../admin/src/Model/ExtensionsModel.php | 344 +++++++++--------- .../admin/tmpl/extensions/default.php | 19 +- src/packages/com_mokowaas/mokowaas.xml | 1 + 4 files changed, 284 insertions(+), 172 deletions(-) create mode 100644 src/packages/com_mokowaas/admin/catalog.xml diff --git a/src/packages/com_mokowaas/admin/catalog.xml b/src/packages/com_mokowaas/admin/catalog.xml new file mode 100644 index 00000000..2122651b --- /dev/null +++ b/src/packages/com_mokowaas/admin/catalog.xml @@ -0,0 +1,92 @@ + + + + + MokoWaaS + pkg_mokowaas + package + Admin dashboard, security firewall, tenant restrictions, health monitoring, and REST API. + icon-shield-alt + Platform +
              https://mokoconsulting.tech/support/products/mokowaas-platform
              + true + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/dev/updates.xml +               + + MokoOnyx + mokoonyx + template + Modern Joomla site template with dark mode, custom layouts, and MokoWaaS integration. + icon-paint-brush + Templates +
              https://mokoconsulting.tech/support/products/mokoonyx-template
              + https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/dev/updates.xml +               + + MokoJoomTOS + com_mokojoomtos + component + Terms of Service and privacy policy component with consent tracking. + icon-file-contract + Components +
              https://mokoconsulting.tech/support/products/mokojoomtos
              + https://git.mokoconsulting.tech/MokoConsulting/MokoJoomTOS/raw/branch/dev/updates.xml +               + + MokoJoomHero + mod_mokojoomhero + module + Random hero image module from a configurable folder. + icon-image + Modules +
              https://mokoconsulting.tech/support/products/mokojoomhero
              + https://git.mokoconsulting.tech/MokoConsulting/MokoJoomHero/raw/branch/dev/updates.xml +               + + MokoWaaS Announce + mod_mokowaas_announce + module + Centralized announcement system via admin module. + icon-bullhorn + Modules +
              https://mokoconsulting.tech/support/products/mokowaas-announce
              + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaSAnnounce/raw/branch/dev/updates.xml +               + + DPCalendar API + mokodpcalendarapi + plugin + Web Services plugin exposing DPCalendar events and calendars via REST API. + icon-calendar + Plugins +
              https://mokoconsulting.tech/support/products/mokodpcalendarapi
              + https://git.mokoconsulting.tech/MokoConsulting/MokoDPCalendarAPI/raw/branch/dev/updates.xml +               + + Gallery Calendar + mokogallerycalendar + plugin + JoomGallery and DPCalendar integration — link galleries to events. + icon-images + Plugins +
              https://mokoconsulting.tech/support/products/mokogallerycalendar
              + https://git.mokoconsulting.tech/MokoConsulting/MokoGalleryCalendar/raw/branch/dev/updates.xml +               + + MokoJoomOpenGraph + pkg_mokoog + package + Open Graph, Twitter Card, and social sharing meta tags for articles, categories, and pages. + icon-share-alt + Components +
              https://mokoconsulting.tech/support/products/mokojoomopengraph
              + https://git.mokoconsulting.tech/MokoConsulting/MokoJoomOpenGraph/raw/branch/dev/updates.xml +               +               diff --git a/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php b/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php index 7618f479..cc42dd3e 100644 --- a/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php +++ b/src/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php @@ -14,140 +14,67 @@ use Joomla\CMS\Factory; use Joomla\CMS\MVC\Model\BaseDatabaseModel; /** - * Extension manager model — fetches Moko Consulting Joomla packages - * from the Gitea API and checks local install status. + * Extension catalog model — reads catalog.xml, fetches each extension's + * updates.xml to resolve latest version and download URL, and checks + * local install status. * * @since 02.32.00 */ class ExtensionsModel extends BaseDatabaseModel { /** - * Curated catalog of Moko Consulting Joomla packages. - * Each entry maps a Gitea repo name to local extension metadata. + * Parsed catalog entries (cached per request). + * + * @var array|null */ - private const CATALOG = [ - 'MokoWaaS' => [ - 'label' => 'MokoWaaS', - 'description' => 'Admin dashboard, security firewall, tenant restrictions, health monitoring, and REST API.', - 'element' => 'pkg_mokowaas', - 'type' => 'package', - 'icon' => 'icon-shield-alt', - 'category' => 'Platform', - 'article' => 'https://mokoconsulting.tech/support/products/mokowaas-platform', - 'protected' => true, - ], - 'MokoOnyx' => [ - 'label' => 'MokoOnyx', - 'description' => 'Modern Joomla site template with dark mode, custom layouts, and MokoWaaS integration.', - 'element' => 'mokoonyx', - 'type' => 'template', - 'icon' => 'icon-paint-brush', - 'category' => 'Templates', - 'article' => 'https://mokoconsulting.tech/support/products/mokoonyx-template', - 'protected' => false, - ], - 'MokoJoomTOS' => [ - 'label' => 'MokoJoomTOS', - 'description' => 'Terms of Service and privacy policy component with consent tracking.', - 'element' => 'com_mokojoomtos', - 'type' => 'component', - 'icon' => 'icon-file-contract', - 'category' => 'Components', - 'article' => 'https://mokoconsulting.tech/support/products/mokojoomtos', - 'protected' => false, - ], - 'MokoJoomHero' => [ - 'label' => 'MokoJoomHero', - 'description' => 'Random hero image module from a configurable folder.', - 'element' => 'mod_mokojoomhero', - 'type' => 'module', - 'icon' => 'icon-image', - 'category' => 'Modules', - 'article' => 'https://mokoconsulting.tech/support/products/mokojoomhero', - 'protected' => false, - ], - 'MokoWaaSAnnounce' => [ - 'label' => 'MokoWaaS Announce', - 'description' => 'Centralized announcement system via admin module.', - 'element' => 'mod_mokowaas_announce', - 'type' => 'module', - 'icon' => 'icon-bullhorn', - 'category' => 'Modules', - 'article' => 'https://mokoconsulting.tech/support/products/mokowaas-announce', - 'protected' => false, - ], - 'MokoDPCalendarAPI' => [ - 'label' => 'DPCalendar API', - 'description' => 'Web Services plugin exposing DPCalendar events and calendars via REST API.', - 'element' => 'mokodpcalendarapi', - 'type' => 'plugin', - 'icon' => 'icon-calendar', - 'category' => 'Plugins', - 'article' => 'https://mokoconsulting.tech/support/products/mokodpcalendarapi', - 'protected' => false, - ], - 'MokoGalleryCalendar' => [ - 'label' => 'Gallery Calendar', - 'description' => 'JoomGallery and DPCalendar integration — link galleries to events.', - 'element' => 'mokogallerycalendar', - 'type' => 'plugin', - 'icon' => 'icon-images', - 'category' => 'Plugins', - 'article' => 'https://mokoconsulting.tech/support/products/mokogallerycalendar', - 'protected' => false, - ], - 'MokoJoomOpenGraph' => [ - 'label' => 'MokoJoomOpenGraph', - 'description' => 'Open Graph meta tags for articles, categories, and pages. Controls Facebook, Twitter, and LinkedIn link previews.', - 'element' => 'pkg_mokoog', - 'type' => 'package', - 'icon' => 'icon-share-alt', - 'category' => 'Components', - 'article' => 'https://mokoconsulting.tech/support/products/mokojoomopengraph', - 'protected' => false, - ], - ]; - - private const GITEA_URL = 'https://git.mokoconsulting.tech'; - private const GITEA_ORG = 'MokoConsulting'; + private ?array $catalogCache = null; /** * Get the full catalog with install status and release info. * - * @return array + * @return array Array of catalog entry objects */ public function getCatalog(): array { - $installed = $this->getInstalledVersions(); + $catalog = $this->loadCatalog(); + $installed = $this->getInstalledVersions($catalog); $packages = []; - foreach (self::CATALOG as $repo => $meta) + foreach ($catalog as $entry) { - $release = $this->fetchLatestRelease($repo); + $release = $this->fetchFromUpdateServer($entry['updateserver'] ?? ''); - $localVersion = $installed[$meta['element']] ?? null; + $localVersion = $installed[$entry['element']] ?? null; $remoteVersion = $release['version'] ?? ''; $downloadUrl = $release['download_url'] ?? ''; - $status = ($localVersion !== null) ? 'installed' : 'not_installed'; + $status = 'not_installed'; - // Get extension_id for uninstall link - $extensionId = $this->getExtensionId($meta['element']); + if ($localVersion !== null) + { + $status = 'installed'; + + if ($remoteVersion !== '' && version_compare($remoteVersion, $localVersion, '>')) + { + $status = 'update_available'; + } + } + + $extensionId = $this->getExtensionId($entry['element']); $packages[] = (object) [ - 'repo' => $repo, - 'label' => $meta['label'], - 'description' => $meta['description'], - 'element' => $meta['element'], - 'type' => $meta['type'], - 'icon' => $meta['icon'], - 'category' => $meta['category'], + 'label' => $entry['name'], + 'description' => $entry['description'], + 'element' => $entry['element'], + 'type' => $entry['type'], + 'icon' => $entry['icon'], + 'category' => $entry['category'], 'local_version' => $localVersion ?? '', 'remote_version' => $remoteVersion, 'download_url' => $downloadUrl, 'status' => $status, - 'article_url' => $meta['article'] ?? '', - 'protected' => $meta['protected'] ?? false, + 'article_url' => $entry['article'] ?? '', + 'protected' => ($entry['protected'] ?? 'false') === 'true', 'extension_id' => $extensionId, ]; } @@ -158,9 +85,9 @@ class ExtensionsModel extends BaseDatabaseModel /** * Install an extension from a remote ZIP URL. * - * @param string $url The download URL. + * @param string $url The download URL * - * @return array Result with success, message, and extension info. + * @return array Result with success, message, and extension info */ public function installFromUrl(string $url): array { @@ -169,14 +96,13 @@ class ExtensionsModel extends BaseDatabaseModel try { - // Download $ch = curl_init($url); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); curl_setopt($ch, CURLOPT_TIMEOUT, 120); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - $data = curl_exec($ch); - $code = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE); + $data = curl_exec($ch); + $code = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE); $error = curl_error($ch); curl_close($ch); @@ -187,7 +113,6 @@ class ExtensionsModel extends BaseDatabaseModel file_put_contents($tmpFile, $data); - // Install via Joomla Installer $installer = new \Joomla\CMS\Installer\Installer(); $result = $installer->install($tmpFile); @@ -212,18 +137,148 @@ class ExtensionsModel extends BaseDatabaseModel } /** - * Get installed versions of all Moko extensions. + * Load and parse the catalog.xml file. + * + * @return array Array of associative arrays, one per extension + */ + private function loadCatalog(): array + { + if ($this->catalogCache !== null) + { + return $this->catalogCache; + } + + $catalogFile = JPATH_ADMINISTRATOR . '/components/com_mokowaas/catalog.xml'; + + if (!file_exists($catalogFile)) + { + $this->catalogCache = []; + + return []; + } + + $xml = @simplexml_load_file($catalogFile); + + if (!$xml) + { + $this->catalogCache = []; + + return []; + } + + $entries = []; + + foreach ($xml->extension as $ext) + { + $entries[] = [ + 'name' => (string) $ext->name, + 'element' => (string) $ext->element, + 'type' => (string) $ext->type, + 'description' => (string) $ext->description, + 'icon' => (string) $ext->icon, + 'category' => (string) $ext->category, + 'article' => (string) $ext->article, + 'protected' => (string) $ext->protected, + 'updateserver' => (string) $ext->updateserver, + ]; + } + + $this->catalogCache = $entries; + + return $entries; + } + + /** + * Fetch the latest version and download URL from an extension's updates.xml. + * + * Parses the standard Joomla update server XML format and returns + * the highest version entry with its download URL. + * + * @param string $updateServerUrl URL to the updates.xml file + * + * @return array [version, download_url] or empty array + */ + private function fetchFromUpdateServer(string $updateServerUrl): array + { + if (empty($updateServerUrl)) + { + return []; + } + + $ch = curl_init($updateServerUrl); + curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + curl_setopt($ch, CURLOPT_TIMEOUT, 10); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); + curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); + $response = curl_exec($ch); + $code = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE); + curl_close($ch); + + if ($code !== 200 || empty($response)) + { + return []; + } + + $xml = @simplexml_load_string($response); + + if (!$xml) + { + return []; + } + + // Find the highest version entry + $bestVersion = '0.0.0'; + $downloadUrl = ''; + + foreach ($xml->update as $update) + { + $ver = (string) ($update->version ?? ''); + + if ($ver === '' || version_compare($ver, $bestVersion, '<=')) + { + continue; + } + + $bestVersion = $ver; + + // Get download URL from + if (isset($update->downloads->downloadurl)) + { + $downloadUrl = (string) $update->downloads->downloadurl; + } + } + + if ($bestVersion === '0.0.0') + { + return []; + } + + return [ + 'version' => $bestVersion, + 'download_url' => $downloadUrl, + ]; + } + + /** + * Get installed versions of catalog extensions. + * + * @param array $catalog The parsed catalog entries * * @return array element => version */ - private function getInstalledVersions(): array + private function getInstalledVersions(array $catalog): array { + if (empty($catalog)) + { + return []; + } + $db = $this->getDatabase(); $elements = []; - foreach (self::CATALOG as $meta) + foreach ($catalog as $entry) { - $elements[] = $db->quote($meta['element']); + $elements[] = $db->quote($entry['element']); } $query = $db->getQuery(true) @@ -244,61 +299,12 @@ class ExtensionsModel extends BaseDatabaseModel return $versions; } - /** - * Fetch the latest release from Gitea for a repo. - * - * @param string $repo Repository name. - * - * @return array [version, download_url] or empty. - */ - private function fetchLatestRelease(string $repo): array - { - $url = self::GITEA_URL . '/api/v1/repos/' . self::GITEA_ORG . '/' . $repo . '/releases?limit=1'; - - $ch = curl_init($url); - curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); - curl_setopt($ch, CURLOPT_TIMEOUT, 10); - curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false); - curl_setopt($ch, CURLOPT_HTTPHEADER, ['Accept: application/json']); - $response = curl_exec($ch); - $code = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE); - curl_close($ch); - - if ($code !== 200 || empty($response)) - { - return []; - } - - $releases = json_decode($response, true); - - if (empty($releases[0])) - { - return []; - } - - $release = $releases[0]; - $version = $release['tag_name'] ?? ''; - - // Find the first .zip asset - $downloadUrl = ''; - - foreach ($release['assets'] ?? [] as $asset) - { - if (str_ends_with(strtolower($asset['name'] ?? ''), '.zip')) - { - $downloadUrl = $asset['browser_download_url'] ?? ''; - break; - } - } - - return [ - 'version' => $version, - 'download_url' => $downloadUrl, - ]; - } - /** * Get the extension_id for an element (for uninstall links). + * + * @param string $element Extension element name + * + * @return int */ private function getExtensionId(string $element): int { diff --git a/src/packages/com_mokowaas/admin/tmpl/extensions/default.php b/src/packages/com_mokowaas/admin/tmpl/extensions/default.php index e5a14684..4ffca746 100644 --- a/src/packages/com_mokowaas/admin/tmpl/extensions/default.php +++ b/src/packages/com_mokowaas/admin/tmpl/extensions/default.php @@ -25,8 +25,9 @@ foreach ($packages as $pkg) } $statusBadge = [ - 'installed' => ['bg-success', 'Installed'], - 'not_installed' => ['bg-secondary', 'Not Installed'], + 'installed' => ['bg-success', 'Installed'], + 'update_available' => ['bg-warning text-dark', 'Update Available'], + 'not_installed' => ['bg-secondary', 'Not Installed'], ]; ?> @@ -63,6 +64,9 @@ $statusBadge = [
              local_version): ?> vlocal_version); ?> + remote_version && $pkg->status === 'update_available'): ?> + → remote_version); ?> + remote_version): ?> Latest: remote_version); ?> @@ -73,7 +77,16 @@ $statusBadge = [ - download_url && $pkg->status === 'not_installed'): ?> + download_url && $pkg->status === 'update_available'): ?> + + download_url && $pkg->status === 'not_installed'): ?>
              + +
              + +
              +
              + +
              +               + From 8d4a5b7a04bcb86f073668133d2c26dd5f1330b4 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 07:29:51 -0500 Subject: [PATCH 202/220] chore: bump version to 02.34.15-dev, update updates.xml Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .mokogitea/manifest.xml | 2 +- .mokogitea/workflows/issue-branch.yml | 2 +- CHANGELOG.md | 2 +- CODE_OF_CONDUCT.md | 2 +- GOVERNANCE.md | 2 +- LICENSE.md | 2 +- README.md | 2 +- SECURITY.md | 2 +- docs/guides/build-guide.md | 4 ++-- docs/guides/configuration-guide.md | 4 ++-- docs/guides/installation-guide.md | 4 ++-- docs/guides/operations-guide.md | 4 ++-- docs/guides/rollback-and-recovery-guide.md | 4 ++-- docs/guides/testing-guide.md | 4 ++-- docs/guides/troubleshooting-guide.md | 4 ++-- docs/guides/upgrade-and-versioning-guide.md | 4 ++-- docs/index.md | 4 ++-- docs/plugin-basic.md | 4 ++-- docs/update-server.md | 2 +- src/packages/com_mokowaas/mokowaas.xml | 4 ++-- src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml | 2 +- .../mod_mokowaas_categories/mod_mokowaas_categories.xml | 2 +- src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml | 2 +- src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml | 2 +- src/packages/plg_system_mokowaas/Extension/MokoWaaS.php | 2 +- .../plg_system_mokowaas/Field/CopyableTokenField.php | 2 +- src/packages/plg_system_mokowaas/mokowaas.xml | 4 ++-- src/packages/plg_system_mokowaas/script.php | 2 +- src/packages/plg_system_mokowaas/services/provider.php | 2 +- .../plg_system_mokowaas_devtools/mokowaas_devtools.xml | 2 +- .../plg_system_mokowaas_firewall/mokowaas_firewall.xml | 2 +- .../plg_system_mokowaas_monitor/mokowaas_monitor.xml | 2 +- .../plg_system_mokowaas_offline/mokowaas_offline.xml | 2 +- src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml | 2 +- src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml | 2 +- src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml | 2 +- src/packages/plg_task_mokowaassync/mokowaassync.xml | 2 +- src/packages/plg_webservices_mokowaas/mokowaas.xml | 2 +- .../plg_webservices_perfectpublisher/perfectpublisher.xml | 2 +- .../plg_webservices_perfectpublisher/services/provider.php | 2 +- .../src/Extension/PerfectPublisherApi.php | 2 +- src/pkg_mokowaas.xml | 2 +- updates.xml | 6 +++--- 43 files changed, 57 insertions(+), 57 deletions(-) diff --git a/.mokogitea/manifest.xml b/.mokogitea/manifest.xml index 7843699f..1582c845 100644 --- a/.mokogitea/manifest.xml +++ b/.mokogitea/manifest.xml @@ -9,7 +9,7 @@ Package - MokoWaaS MokoConsulting White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments - 02.34.14 + 02.34.15 GNU General Public License v3 diff --git a/.mokogitea/workflows/issue-branch.yml b/.mokogitea/workflows/issue-branch.yml index 076928cd..095b6b0a 100644 --- a/.mokogitea/workflows/issue-branch.yml +++ b/.mokogitea/workflows/issue-branch.yml @@ -5,7 +5,7 @@ # FILE INFORMATION # DEFGROUP: Gitea.Workflow # INGROUP: moko-platform.Automation -# VERSION: 02.34.14 +# VERSION: 02.34.15 # BRIEF: Auto-create feature branch when an issue is opened name: "Universal: Issue Branch" diff --git a/CHANGELOG.md b/CHANGELOG.md index bd914d67..a1b0f26a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./CHANGELOG.md - VERSION: 02.34.14 + VERSION: 02.34.15 BRIEF: Version history using `Keep a Changelog` --> diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 3f1bda25..ca6437e4 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -14,7 +14,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: ./CODE_OF_CONDUCT.md BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default --> diff --git a/GOVERNANCE.md b/GOVERNANCE.md index c70ca2e4..4bf2ae82 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -19,7 +19,7 @@ DEFGROUP: mokoconsulting-tech.MokoWaaSBrand INGROUP: MokoStandards.Governance REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /GOVERNANCE.md BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand --> diff --git a/LICENSE.md b/LICENSE.md index 4b684a41..5b7b8ac1 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -15,7 +15,7 @@ INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: ./LICENSE.md - VERSION: 02.34.14 + VERSION: 02.34.15 BRIEF: Project license (GPL-3.0-or-later) --> GNU GENERAL PUBLIC LICENSE diff --git a/README.md b/README.md index b5dd20a3..be6b79d4 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /README.md BRIEF: MokoWaaS platform plugin for Joomla --> diff --git a/SECURITY.md b/SECURITY.md index e0c50358..cd97360c 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -23,7 +23,7 @@ DEFGROUP: [PROJECT_NAME] INGROUP: [PROJECT_NAME].Documentation REPO: [REPOSITORY_URL] PATH: /SECURITY.md -VERSION: 02.34.14 +VERSION: 02.34.15 BRIEF: Security vulnerability reporting and handling policy --> diff --git a/docs/guides/build-guide.md b/docs/guides/build-guide.md index a8dcd712..11c6475c 100644 --- a/docs/guides/build-guide.md +++ b/docs/guides/build-guide.md @@ -11,13 +11,13 @@ INGROUP: MokoWaaS.Build REPO: https://github.com/mokoconsulting-tech/mokowaas FILE: build-guide.md - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/ BRIEF: Build and packaging guide for the MokoWaaS system plugin NOTE: Defines environment setup, repository layout, packaging rules, and release preparation --> -# MokoWaaS Build Guide (VERSION: 02.34.14) +# MokoWaaS Build Guide (VERSION: 02.34.15) ## 1. Purpose diff --git a/docs/guides/configuration-guide.md b/docs/guides/configuration-guide.md index b1567893..b28fe443 100644 --- a/docs/guides/configuration-guide.md +++ b/docs/guides/configuration-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/configuration-guide.md BRIEF: Configuration guide for the MokoWaaS system plugin NOTE: Defines plugin parameters, expected behaviors, and recommended defaults --> -# MokoWaaS Configuration Guide (VERSION: 02.34.14) +# MokoWaaS Configuration Guide (VERSION: 02.34.15) ## 1. Objective diff --git a/docs/guides/installation-guide.md b/docs/guides/installation-guide.md index 16a488c7..88e0b5e0 100644 --- a/docs/guides/installation-guide.md +++ b/docs/guides/installation-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/installation-guide.md BRIEF: Installation guide for the MokoWaaS system plugin NOTE: First document in the guide set --> -# MokoWaaS Installation Guide (VERSION: 02.34.14) +# MokoWaaS Installation Guide (VERSION: 02.34.15) ## Introduction diff --git a/docs/guides/operations-guide.md b/docs/guides/operations-guide.md index 835e2259..0e71a462 100644 --- a/docs/guides/operations-guide.md +++ b/docs/guides/operations-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/operations-guide.md BRIEF: Operational guide for administering and managing the MokoWaaS system plugin NOTE: Defines lifecycle, responsibilities, and operational behaviors --> -# MokoWaaS Operations Guide (VERSION: 02.34.14) +# MokoWaaS Operations Guide (VERSION: 02.34.15) ## Introduction diff --git a/docs/guides/rollback-and-recovery-guide.md b/docs/guides/rollback-and-recovery-guide.md index d309adaa..fd610b23 100644 --- a/docs/guides/rollback-and-recovery-guide.md +++ b/docs/guides/rollback-and-recovery-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/rollback-and-recovery-guide.md BRIEF: Rollback and recovery guide for restoring stable operation after plugin related incidents NOTE: Completes the core guide set for WaaS plugin governance --> -# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.14) +# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.15) ## Introduction diff --git a/docs/guides/testing-guide.md b/docs/guides/testing-guide.md index 386a6891..c997e708 100644 --- a/docs/guides/testing-guide.md +++ b/docs/guides/testing-guide.md @@ -7,13 +7,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/testing-guide.md BRIEF: Testing guide for MokoWaaS v02.01.08 NOTE: Covers manual test procedures for language overrides, install/uninstall, and configuration --> -# MokoWaaS Testing Guide (VERSION: 02.34.14) +# MokoWaaS Testing Guide (VERSION: 02.34.15) ## 1. Prerequisites diff --git a/docs/guides/troubleshooting-guide.md b/docs/guides/troubleshooting-guide.md index 70bb6a0a..72d0e200 100644 --- a/docs/guides/troubleshooting-guide.md +++ b/docs/guides/troubleshooting-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/troubleshooting-guide.md BRIEF: Troubleshooting guide for diagnosing and resolving issues related to the MokoWaaS plugin NOTE: Designed for administrators and WaaS operations teams --> -# MokoWaaS Troubleshooting Guide (VERSION: 02.34.14) +# MokoWaaS Troubleshooting Guide (VERSION: 02.34.15) ## Introduction diff --git a/docs/guides/upgrade-and-versioning-guide.md b/docs/guides/upgrade-and-versioning-guide.md index 2ac2b6f4..66e8cbc9 100644 --- a/docs/guides/upgrade-and-versioning-guide.md +++ b/docs/guides/upgrade-and-versioning-guide.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Guides REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/guides/upgrade-and-versioning-guide.md BRIEF: Guide for updating, versioning, and maintaining the MokoWaaS plugin NOTE: Defines release flow, version rules, and upgrade validation --> -# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.14) +# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.15) ## Introduction diff --git a/docs/index.md b/docs/index.md index 13bacc0a..82b87edb 100644 --- a/docs/index.md +++ b/docs/index.md @@ -10,13 +10,13 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS.Documentation REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /docs/index.md BRIEF: Master index of all documentation for the MokoWaaS plugin NOTE: Automatically maintained index for all guide canvases --> -# MokoWaaS Documentation Index (VERSION: 02.34.14) +# MokoWaaS Documentation Index (VERSION: 02.34.15) ## Introduction diff --git a/docs/plugin-basic.md b/docs/plugin-basic.md index a5d18cff..00ad9b41 100644 --- a/docs/plugin-basic.md +++ b/docs/plugin-basic.md @@ -11,12 +11,12 @@ INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas PATH: /docs/plugin-basic.md - VERSION: 02.34.14 + VERSION: 02.34.15 BRIEF: Baseline documentation for the MokoWaaS system plugin NOTE: Foundational reference for internal and external stakeholders --> -# MokoWaaS Plugin Overview (VERSION: 02.34.14) +# MokoWaaS Plugin Overview (VERSION: 02.34.15) ## Introduction diff --git a/docs/update-server.md b/docs/update-server.md index 2e70462c..aad5dadf 100644 --- a/docs/update-server.md +++ b/docs/update-server.md @@ -10,7 +10,7 @@ DEFGROUP: MokoWaaS.Documentation INGROUP: MokoStandards.Templates REPO: https://github.com/mokoconsulting-tech/MokoWaaS PATH: /docs/update-server.md -VERSION: 02.34.14 +VERSION: 02.34.15 BRIEF: How this extension's Joomla update server file (update.xml) is managed --> diff --git a/src/packages/com_mokowaas/mokowaas.xml b/src/packages/com_mokowaas/mokowaas.xml index 0d020c1c..4d2e3f4c 100644 --- a/src/packages/com_mokowaas/mokowaas.xml +++ b/src/packages/com_mokowaas/mokowaas.xml @@ -8,7 +8,7 @@ DEFGROUP: Joomla.Component INGROUP: MokoWaaS REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /mokowaas.xml BRIEF: Component manifest for MokoWaaS admin dashboard and REST API --> @@ -20,7 +20,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints. Moko\Component\MokoWaaS diff --git a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml index d1175cd9..4909e800 100644 --- a/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml +++ b/src/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 MOD_MOKOWAAS_CACHE_DESC Moko\Module\MokoWaaSCache diff --git a/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml b/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml index 51e9579c..c274468c 100644 --- a/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml +++ b/src/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 MOD_MOKOWAAS_CATEGORIES_DESC Moko\Module\MokoWaaSCategories diff --git a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml index fea01aa2..be8f768d 100644 --- a/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml +++ b/src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 MOD_MOKOWAAS_CPANEL_DESC Moko\Module\MokoWaaSCpanel diff --git a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml index 54fc5060..571f575f 100644 --- a/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml +++ b/src/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu. Moko\Module\MokoWaaSMenu diff --git a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php index c9a71966..109d539d 100644 --- a/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php +++ b/src/packages/plg_system_mokowaas/Extension/MokoWaaS.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.14 + * VERSION: 02.34.15 * PATH: /src/Extension/MokoWaaS.php * NOTE: Core system plugin for MokoWaaS admin tools suite */ diff --git a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php index e8441cc9..3acccaf6 100644 --- a/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php +++ b/src/packages/plg_system_mokowaas/Field/CopyableTokenField.php @@ -8,7 +8,7 @@ * FILE INFORMATION * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS - * VERSION: 02.34.14 + * VERSION: 02.34.15 * PATH: /src/Field/CopyableTokenField.php * BRIEF: Read-only token field with a copy-to-clipboard button */ diff --git a/src/packages/plg_system_mokowaas/mokowaas.xml b/src/packages/plg_system_mokowaas/mokowaas.xml index 0274ebc3..40bdfe4b 100644 --- a/src/packages/plg_system_mokowaas/mokowaas.xml +++ b/src/packages/plg_system_mokowaas/mokowaas.xml @@ -16,7 +16,7 @@ DEFGROUP: Joomla.Plugin INGROUP: MokoWaaS REPO: https://github.com/mokoconsulting-tech/mokowaas - VERSION: 02.34.14 + VERSION: 02.34.15 PATH: /src/mokowaas.xml BRIEF: Plugin manifest for MokoWaaS system plugin NOTE: Defines installation metadata, files, and configuration for Joomla @@ -30,7 +30,7 @@ GNU General Public License version 3 or later; see LICENSE.md hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations. Moko\Plugin\System\MokoWaaS script.php diff --git a/src/packages/plg_system_mokowaas/script.php b/src/packages/plg_system_mokowaas/script.php index 705a8106..866156f4 100644 --- a/src/packages/plg_system_mokowaas/script.php +++ b/src/packages/plg_system_mokowaas/script.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.14 + * VERSION: 02.34.15 * PATH: /src/script.php * BRIEF: Installation script for MokoWaaS plugin * NOTE: Handles installation, update, and uninstallation tasks including language override deployment diff --git a/src/packages/plg_system_mokowaas/services/provider.php b/src/packages/plg_system_mokowaas/services/provider.php index 81d292ea..294cb3bc 100644 --- a/src/packages/plg_system_mokowaas/services/provider.php +++ b/src/packages/plg_system_mokowaas/services/provider.php @@ -22,7 +22,7 @@ * DEFGROUP: Joomla.Plugin * INGROUP: MokoWaaS * REPO: https://github.com/mokoconsulting-tech/mokowaas - * VERSION: 02.34.14 + * VERSION: 02.34.15 * PATH: /src/services/provider.php * BRIEF: Service provider for dependency injection in Joomla 5.x * NOTE: Registers the plugin with Joomla's DI container diff --git a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml index 7ccd4a77..29d3f160 100644 --- a/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml +++ b/src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC Moko\Plugin\System\MokoWaaSDevTools diff --git a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml index a8a14719..b9c8e69a 100644 --- a/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml +++ b/src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC Moko\Plugin\System\MokoWaaSFirewall diff --git a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml index 1eca2cfe..328563aa 100644 --- a/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml +++ b/src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 PLG_SYSTEM_MOKOWAAS_MONITOR_DESC Moko\Plugin\System\MokoWaaSMonitor diff --git a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml index fb13892c..83cf31c3 100644 --- a/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml +++ b/src/packages/plg_system_mokowaas_offline/mokowaas_offline.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC Moko\Plugin\System\MokoWaaSOffline diff --git a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml index fe420fea..16e9028c 100644 --- a/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml +++ b/src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 PLG_SYSTEM_MOKOWAAS_TENANT_DESC Moko\Plugin\System\MokoWaaSTenant diff --git a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml index e7d1b1c1..2a6a31aa 100644 --- a/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml +++ b/src/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml @@ -8,7 +8,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions. Moko\Plugin\Task\MokoWaaSTickets diff --git a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml index 49d71650..d2ed8872 100644 --- a/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml +++ b/src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 PLG_TASK_MOKOWAASDEMO_DESC Moko\Plugin\Task\MokoWaaSDemo diff --git a/src/packages/plg_task_mokowaassync/mokowaassync.xml b/src/packages/plg_task_mokowaassync/mokowaassync.xml index 91bfbf4a..32eb6c7b 100644 --- a/src/packages/plg_task_mokowaassync/mokowaassync.xml +++ b/src/packages/plg_task_mokowaassync/mokowaassync.xml @@ -12,7 +12,7 @@ GNU General Public License version 3 or later; see LICENSE hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 PLG_TASK_MOKOWAASSYNC_DESC Moko\Plugin\Task\MokoWaaSSync diff --git a/src/packages/plg_webservices_mokowaas/mokowaas.xml b/src/packages/plg_webservices_mokowaas/mokowaas.xml index 26b2748b..cc42a073 100644 --- a/src/packages/plg_webservices_mokowaas/mokowaas.xml +++ b/src/packages/plg_webservices_mokowaas/mokowaas.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info. Moko\Plugin\WebServices\MokoWaaS diff --git a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml index cc684f38..62f92a83 100644 --- a/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml +++ b/src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml @@ -7,7 +7,7 @@ GPL-3.0-or-later hello@mokoconsulting.tech https://mokoconsulting.tech - 02.34.14 + 02.34.15 Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds. Moko\Plugin\WebServices\PerfectPublisher diff --git a/src/packages/plg_webservices_perfectpublisher/services/provider.php b/src/packages/plg_webservices_perfectpublisher/services/provider.php index dfaff1e0..1e5171e4 100644 --- a/src/packages/plg_webservices_perfectpublisher/services/provider.php +++ b/src/packages/plg_webservices_perfectpublisher/services/provider.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php - * VERSION: 02.34.14 + * VERSION: 02.34.15 * BRIEF: DI service provider for Perfect Publisher Web Services plugin */ diff --git a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php index dfef19d8..dbcb8547 100644 --- a/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php +++ b/src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php @@ -8,7 +8,7 @@ * INGROUP: MokoWaaS * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php - * VERSION: 02.34.14 + * VERSION: 02.34.15 * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet) */ diff --git a/src/pkg_mokowaas.xml b/src/pkg_mokowaas.xml index c2661e5b..e6abb217 100644 --- a/src/pkg_mokowaas.xml +++ b/src/pkg_mokowaas.xml @@ -2,7 +2,7 @@ Package - MokoWaaS mokowaas - 02.34.14 + 02.34.15 2026-06-02 Moko Consulting hello@mokoconsulting.tech diff --git a/updates.xml b/updates.xml index 47a20efd..b2ac4f70 100644 --- a/updates.xml +++ b/updates.xml @@ -1,7 +1,7 @@ @@ -11,11 +11,11 @@ pkg_mokowaas package site - 02.34.14-dev + 02.34.15-dev 2026-06-06 https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/tag/development - https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.34.14-dev.zip + https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/releases/download/development/pkg_mokowaas-02.34.15-dev.zip dev https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/CHANGELOG.md From 17ef84e867742d1c4ce028e44d42c054e3e9581a Mon Sep 17 00:00:00 2001 From: Jonathan Miller <1+jmiller@noreply.git.mokoconsulting.tech> Date: Sat, 6 Jun 2026 12:31:31 +0000 Subject: [PATCH 203/220] chore: sync .mokogitea/workflows/pre-release.yml from moko-platform [skip ci] --- .mokogitea/workflows/pre-release.yml | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/.mokogitea/workflows/pre-release.yml b/.mokogitea/workflows/pre-release.yml index 7ebed5d6..1a9eeef0 100644 --- a/.mokogitea/workflows/pre-release.yml +++ b/.mokogitea/workflows/pre-release.yml @@ -63,15 +63,22 @@ jobs: MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }} MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting run: | - if ! command -v composer &> /dev/null; then - sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 + # Use pre-installed /opt/moko-platform if available (updated by cron every 6h) + if [ -f “/opt/moko-platform/cli/version_bump.php” ] && [ -f “/opt/moko-platform/vendor/autoload.php” ]; then + echo “Using pre-installed /opt/moko-platform” + echo “MOKO_CLI=/opt/moko-platform/cli” >> “$GITHUB_ENV” + else + echo “Falling back to fresh clone” + if ! command -v composer &> /dev/null; then + sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1 + fi + rm -rf /tmp/moko-platform-api + git clone --depth 1 --branch main --quiet \ + “https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git” \ + /tmp/moko-platform-api + cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet + echo “MOKO_CLI=/tmp/moko-platform-api/cli” >> “$GITHUB_ENV” fi - rm -rf /tmp/moko-platform-api - git clone --depth 1 --branch main --quiet \ - "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \ - /tmp/moko-platform-api - cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet - echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV" - name: Detect platform id: platform From 1fe19fe5f1609873b83f2bd952b28dc3a460fbd9 Mon Sep 17 00:00:00 2001 From: Jonathan Miller Date: Sat, 6 Jun 2026 07:32:19 -0500 Subject: [PATCH 204/220] fix: cache module uses split button layout "Clear: Cache | Temp" Single header item with two clickable halves instead of two separate status bar entries. Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) --- .../mod_mokowaas_cache/tmpl/default.php | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/src/packages/mod_mokowaas_cache/tmpl/default.php b/src/packages/mod_mokowaas_cache/tmpl/default.php index 8bc737ce..1f46350e 100644 --- a/src/packages/mod_mokowaas_cache/tmpl/default.php +++ b/src/packages/mod_mokowaas_cache/tmpl/default.php @@ -1,38 +1,38 @@ - -
              - -
              -
              - -
              -               + - -
              - -
              -
              - -
              -               +
              + Clear: + + Cache + + | + + Temp + +