Merge remote-tracking branch 'origin/dev'

# Conflicts:
#	.mokogitea/manifest.xml
#	.mokogitea/workflows/issue-branch.yml
#	CHANGELOG.md
#	CODE_OF_CONDUCT.md
#	GOVERNANCE.md
#	LICENSE.md
#	README.md
#	SECURITY.md
#	docs/guides/build-guide.md
#	docs/guides/configuration-guide.md
#	docs/guides/installation-guide.md
#	docs/guides/operations-guide.md
#	docs/guides/rollback-and-recovery-guide.md
#	docs/guides/testing-guide.md
#	docs/guides/troubleshooting-guide.md
#	docs/guides/upgrade-and-versioning-guide.md
#	docs/index.md
#	docs/plugin-basic.md
#	docs/update-server.md
#	source/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml
#	source/packages/plg_system_mokowaas/Field/CopyableTokenField.php
#	source/packages/plg_system_mokowaas/script.php
#	source/packages/plg_system_mokowaas/services/provider.php
#	source/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml
#	source/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml
#	source/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml
#	source/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml
#	source/packages/plg_task_mokowaasdemo/mokowaasdemo.xml
#	source/packages/plg_task_mokowaasdemo/src/Service/DemoResetService.php
#	source/packages/plg_task_mokowaassync/mokowaassync.xml
#	source/packages/plg_task_mokowaassync/src/Service/ContentSyncReceiver.php
#	source/packages/plg_task_mokowaassync/src/Service/ContentSyncService.php
#	source/packages/plg_webservices_mokowaas/mokowaas.xml
#	source/packages/plg_webservices_perfectpublisher/perfectpublisher.xml
#	source/packages/plg_webservices_perfectpublisher/services/provider.php
#	source/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php
#	source/pkg_mokowaas.xml
#	src/packages/com_mokowaas/mokowaas.xml
#	src/packages/plg_system_mokowaas/Extension/MokoWaaS.php
#	src/packages/plg_system_mokowaas/Field/AllowedIpsField.php
#	src/packages/plg_system_mokowaas/Field/CurrentIpField.php
#	src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php
#	src/packages/plg_system_mokowaas/Field/NextResetField.php
#	src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php
#	src/packages/plg_system_mokowaas/mokowaas.xml

.mokogitea/manifest.xml

@@ -9,7 +9,11 @@
     <display-name>Package - MokoWaaS</display-name>
     <org>MokoConsulting</org>
     <description>White-label identity, security hardening, and tenant restriction layer for WaaS-managed Joomla environments</description>
-    <version>02.34.29</version>
+<<<<<<< HEAD
+    <version>02.34.00</version>
+=======
+    <version>02.34.16</version>
+>>>>>>> origin/dev
     <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
   </identity>
   <governance>

.mokogitea/workflows/auto-release.yml

@@ -17,7 +17,7 @@
 # |  Reads manifest.xml (joomla|dolibarr|generic) to branch logic.       |
 # |                                                                        |
 # |  Platform-specific:                                                    |
-# |    joomla:   XML manifest, type-prefixed packages                      |
+# |    joomla:   XML manifest, updates.xml, type-prefixed packages         |
 # |    dolibarr: mod*.class.php, update.txt, dev version reset             |
 # |    generic:  README-only, no update stream                             |
 # |                                                                        |
@@ -71,21 +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
+          if ! command -v composer &> /dev/null; then
-            echo Using pre-installed /opt/moko-platform
+            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
-            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
-          else
-            echo Falling back to fresh clone
-            if ! command -v composer > /dev/null 2>&1; 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
-            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
-            git clone --depth 1 --branch main --quiet $CLONE_URL /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: Rename branch to rc
         run: |
@@ -107,13 +102,14 @@ jobs:
         run: |
           php ${MOKO_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 release built" >> $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:
@@ -140,7 +136,7 @@ jobs:
         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 "::error::Merge conflict markers found - aborting release"
             echo "## Release Blocked: Conflict Markers" >> $GITHUB_STEP_SUMMARY
             echo '```' >> $GITHUB_STEP_SUMMARY
             echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY
@@ -155,27 +151,23 @@ 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
+          if ! command -v composer &> /dev/null; then
-            echo Using pre-installed /opt/moko-platform
+            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
-            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
-          else
-            echo Falling back to fresh clone
-            if ! command -v composer > /dev/null 2>&1; 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
-            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
-            git clone --depth 1 --branch main --quiet $CLONE_URL /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: "Publish stable release"
         run: |
           php ${MOKO_CLI}/release_publish.php \
             --path . --stability stable --bump minor --branch main \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}"
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --skip-update-stream
 
       - name: Update release notes from CHANGELOG.md
         run: |
@@ -252,7 +244,7 @@ jobs:
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
           TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
 
-          # Delete rc branch (ephemeral — created by promote-rc)
+          # 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"
@@ -309,7 +301,7 @@ jobs:
             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
+            echo "## Already Released - ${VERSION}" >> $GITHUB_STEP_SUMMARY
           else
             echo "" >> $GITHUB_STEP_SUMMARY
             echo "## Build & Release Complete (${PLATFORM})" >> $GITHUB_STEP_SUMMARY

.mokogitea/workflows/issue-branch.yml

@@ -5,7 +5,11 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: moko-platform.Automation
-# VERSION: 02.34.29
+<<<<<<< HEAD
+# VERSION: 02.34.00
+=======
+# VERSION: 02.34.16
+>>>>>>> origin/dev
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

.mokogitea/workflows/pre-release.yml

@@ -64,19 +64,20 @@ jobs:
           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/cli/manifest_element.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
+          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 “Using pre-installed /opt/moko-platform”
-            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+            echo “MOKO_CLI=/opt/moko-platform/cli” >> “$GITHUB_ENV”
           else
-            echo Falling back to fresh clone
+            echo “Falling back to fresh clone”
-            if ! command -v composer > /dev/null 2>&1; then
+            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
+              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
-            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet \
-            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+              “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
+            echo “MOKO_CLI=/tmp/moko-platform-api/cli” >> “$GITHUB_ENV”
           fi
 
       - name: Detect platform
@@ -117,9 +118,6 @@ jobs:
             --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
           php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
 
-          # Ensure licensing tags (updateservers, dlid) if enabled in manifest.xml
-          php ${MOKO_CLI}/manifest_licensing.php --path . --fix 2>/dev/null || true
-
           # Append suffix for output
           if [ -n "$SUFFIX" ]; then
             VERSION="${VERSION}${SUFFIX}"

CHANGELOG.md

@@ -14,7 +14,11 @@
  INGROUP: MokoWaaS.Documentation
  REPO: https://github.com/mokoconsulting-tech/mokowaas
  PATH: ./CHANGELOG.md
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  BRIEF: Version history using `Keep a Changelog`
 -->
 
@@ -22,39 +26,6 @@
 
 ## [Unreleased]
 
-### Fixed
-- Download key lost on update: cleanupStaleUpdateSites used old /raw/branch/main/ URL format, deleting the manifest-registered update site that held the key
-
-## [02.35.00] - 2026-06-06
-
-### Added
-- Core plugin stripped to heartbeat-only config (~5,500 lines removed)
-- Extension catalog (catalog.xml) with update server discovery (#186)
-- Download key preservation across Joomla updates (#187)
-- Remote login endpoint for MokoWaaSBase auto-login
-- Provision reset API for new client setup (hits, versions, tokens)
-- Setup required banner after provision reset
-- Support verification PIN (MOKO-XXXX-XXXX)
-- mod_mokowaas_categories — auto-category tree menu (#184)
-- Cache/temp split button in status bar
-- Dashboard version tiles for component and modules
-- Monitor plugin sends full health payload to MokoWaaSBase
-- Firewall: block_frontend_superuser, own trusted_ip_entry.xml
-- DevTools: reset download keys toggle
-
-### Changed
-- Renamed src/ to source/ (#188)
-- Service classes relocated to owning plugins
-- API controller execute() signatures fixed (#183)
-- Joomla 5/6 event compatibility in DevTools and Monitor
-- Dead placeholder resolver removed from install script
-
-### Fixed
-- Firewall subform paths after core cleanup
-- Missing Security Headers language strings
-
-## [02.34.00] - 2026-06-04
-
 ### Added
 - Database Tools view — table status, optimize, repair, session purge (#127)
 - Cache Cleanup view — directory size reporting and one-click cleanup (#128)

CODE_OF_CONDUCT.md

@@ -14,7 +14,11 @@
 	DEFGROUP: Joomla.Plugin
 	INGROUP: MokoWaaS.Documentation
 	REPO: https://github.com/mokoconsulting-tech/mokowaas
-	VERSION: 02.34.29
+<<<<<<< HEAD
+	VERSION: 02.34.00
+=======
+	VERSION: 02.34.16
+>>>>>>> origin/dev
 	PATH: ./CODE_OF_CONDUCT.md
 	BRIEF: Reference + packaging repo for Moko Consulting Developer GPT Other Default
 -->

GOVERNANCE.md

@@ -19,7 +19,11 @@
  DEFGROUP: mokoconsulting-tech.MokoWaaSBrand
  INGROUP: MokoStandards.Governance
  REPO: https://github.com/mokoconsulting-tech/MokoWaaSBrand
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  PATH: /GOVERNANCE.md
  BRIEF: Project governance rules, roles, and decision process for MokoWaaSBrand
 -->

LICENSE.md

@@ -15,7 +15,11 @@
 	INGROUP: MokoWaaS.Documentation
   REPO: https://github.com/mokoconsulting-tech/mokowaas
 	PATH: ./LICENSE.md
-	VERSION: 02.34.29
+<<<<<<< HEAD
+	VERSION: 02.34.00
+=======
+	VERSION: 02.34.16
+>>>>>>> origin/dev
 	BRIEF: Project license (GPL-3.0-or-later)
 -->
 										GNU GENERAL PUBLIC LICENSE

README.md

@@ -9,7 +9,11 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS
  REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  PATH: /README.md
  BRIEF: MokoWaaS platform plugin for Joomla
 -->

SECURITY.md

@@ -23,7 +23,11 @@ DEFGROUP: [PROJECT_NAME]
 INGROUP: [PROJECT_NAME].Documentation
 REPO: [REPOSITORY_URL]
 PATH: /SECURITY.md
-VERSION: 02.34.29
+<<<<<<< HEAD
+VERSION: 02.34.00
+=======
+VERSION: 02.34.16
+>>>>>>> origin/dev
 BRIEF: Security vulnerability reporting and handling policy
 -->
 

docs/guides/build-guide.md

@@ -11,13 +11,21 @@
  INGROUP: MokoWaaS.Build
  REPO: https://github.com/mokoconsulting-tech/mokowaas
  FILE: build-guide.md
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Build Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Build Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## 1. Purpose
 

docs/guides/configuration-guide.md

@@ -10,13 +10,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Configuration Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Configuration Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## 1. Objective
 

docs/guides/installation-guide.md

@@ -10,13 +10,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Installation Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Installation Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## Introduction
 

docs/guides/operations-guide.md

@@ -10,13 +10,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Operations Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Operations Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## Introduction
 

docs/guides/rollback-and-recovery-guide.md

@@ -10,13 +10,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Rollback and Recovery Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## Introduction
 

docs/guides/testing-guide.md

@@ -7,13 +7,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Testing Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Testing Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## 1. Prerequisites
 

docs/guides/troubleshooting-guide.md

@@ -10,13 +10,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Troubleshooting Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Troubleshooting Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## Introduction
 

docs/guides/upgrade-and-versioning-guide.md

@@ -10,13 +10,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Guides
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.00)
+=======
+# MokoWaaS Upgrade and Versioning Guide (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## Introduction
 

docs/index.md

@@ -10,13 +10,21 @@
  DEFGROUP: Joomla.Plugin
  INGROUP: MokoWaaS.Documentation
  REPO: https://github.com/mokoconsulting-tech/mokowaas
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  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.29)
+<<<<<<< HEAD
+# MokoWaaS Documentation Index (VERSION: 02.34.00)
+=======
+# MokoWaaS Documentation Index (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## Introduction
 

docs/plugin-basic.md

@@ -11,12 +11,20 @@
  INGROUP: MokoWaaS
  REPO: https://github.com/mokoconsulting-tech/mokowaas
  PATH: /docs/plugin-basic.md
- VERSION: 02.34.29
+<<<<<<< HEAD
+ VERSION: 02.34.00
+=======
+ VERSION: 02.34.16
+>>>>>>> origin/dev
  BRIEF: Baseline documentation for the MokoWaaS system plugin
  NOTE: Foundational reference for internal and external stakeholders
 -->
 
-# MokoWaaS Plugin Overview (VERSION: 02.34.29)
+<<<<<<< HEAD
+# MokoWaaS Plugin Overview (VERSION: 02.34.00)
+=======
+# MokoWaaS Plugin Overview (VERSION: 02.34.16)
+>>>>>>> origin/dev
 
 ## Introduction
 

docs/update-server.md

@@ -10,7 +10,11 @@ DEFGROUP: MokoWaaS.Documentation
 INGROUP: MokoStandards.Templates
 REPO: https://github.com/mokoconsulting-tech/MokoWaaS
 PATH: /docs/update-server.md
-VERSION: 02.34.29
+<<<<<<< HEAD
+VERSION: 02.34.00
+=======
+VERSION: 02.34.16
+>>>>>>> origin/dev
 BRIEF: How this extension's Joomla update server file (update.xml) is managed
 -->
 

source/packages/com_mokowaas/admin/catalog.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
  Extension catalog for MokoWaaS Extension Manager.
- Each entry points to the extension's own updates.xml. The installer
+ Each entry points to the extension's own updates.xml — the installer
- resolves the latest version and download URL at runtime, respecting
+ resolves the latest version and download URL at runtime.
- the site's configured update channel (dev/stable).
 
  To add an extension: copy an <extension> block and fill in the fields.
+ The updateserver URL must point to a valid Joomla updates.xml file.
 -->
 <catalog>
 	<extension>
@@ -19,16 +19,6 @@
 		<protected>true</protected>
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/dev/updates.xml</updateserver>
 	</extension>
-	<extension>
-		<name>MokoWaaSBase</name>
-		<element>pkg_mokowaasbase</element>
-		<type>package</type>
-		<description>Centralized control panel for managing all MokoWaaS client installations.</description>
-		<icon>icon-tachometer-alt</icon>
-		<category>Platform</category>
-		<article>https://mokoconsulting.tech/support/products/mokowaas-base</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaSBase/raw/branch/dev/updates.xml</updateserver>
-	</extension>
 	<extension>
 		<name>MokoOnyx</name>
 		<element>mokoonyx</element>
@@ -40,24 +30,14 @@
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
-		<name>MokoJoomOpenGraph</name>
+		<name>MokoJoomTOS</name>
-		<element>pkg_mokoog</element>
+		<element>com_mokojoomtos</element>
-		<type>package</type>
+		<type>component</type>
-		<description>Open Graph, Twitter Card, and social sharing meta tags for articles, categories, and pages.</description>
+		<description>Terms of Service and privacy policy component with consent tracking.</description>
-		<icon>icon-share-alt</icon>
+		<icon>icon-file-contract</icon>
-		<category>SEO</category>
+		<category>Components</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoomopengraph</article>
+		<article>https://mokoconsulting.tech/support/products/mokojoomtos</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomOpenGraph/raw/branch/dev/updates.xml</updateserver>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomTOS/raw/branch/dev/updates.xml</updateserver>
-	</extension>
-	<extension>
-		<name>MokoJoomBackup</name>
-		<element>pkg_mokojoombackup</element>
-		<type>package</type>
-		<description>Automated backup system with Borg integration, scheduled tasks, and remote storage.</description>
-		<icon>icon-archive</icon>
-		<category>Tools</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoombackup</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomBackup/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
 		<name>MokoJoomHero</name>
@@ -70,34 +50,14 @@
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomHero/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
-		<name>MokoJoomCommunity</name>
+		<name>MokoWaaS Announce</name>
-		<element>pkg_mokojoomcommunity</element>
+		<element>mod_mokowaas_announce</element>
-		<type>package</type>
-		<description>Community Builder integration package with custom fields and user management.</description>
-		<icon>icon-users</icon>
-		<category>Community</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoomcommunity</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCommunity/raw/branch/dev/updates.xml</updateserver>
-	</extension>
-	<extension>
-		<name>MokoJoomCross</name>
-		<element>plg_system_mokojoomcross</element>
-		<type>plugin</type>
-		<description>Cross-extension integration plugin for Joomla component interoperability.</description>
-		<icon>icon-link</icon>
-		<category>Plugins</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoomcross</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomCross/raw/branch/dev/updates.xml</updateserver>
-	</extension>
-	<extension>
-		<name>MokoJoomStoreLocator</name>
-		<element>mod_mokojoomstorelocator</element>
 		<type>module</type>
-		<description>Store locator module with Google Maps integration and search.</description>
+		<description>Centralized announcement system via admin module.</description>
-		<icon>icon-map-marker-alt</icon>
+		<icon>icon-bullhorn</icon>
 		<category>Modules</category>
-		<article>https://mokoconsulting.tech/support/products/mokojoomstorelocator</article>
+		<article>https://mokoconsulting.tech/support/products/mokowaas-announce</article>
-		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomStoreLocator/raw/branch/dev/updates.xml</updateserver>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoWaaSAnnounce/raw/branch/dev/updates.xml</updateserver>
 	</extension>
 	<extension>
 		<name>DPCalendar API</name>
@@ -119,4 +79,14 @@
 		<article>https://mokoconsulting.tech/support/products/mokogallerycalendar</article>
 		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoGalleryCalendar/raw/branch/dev/updates.xml</updateserver>
 	</extension>
+	<extension>
+		<name>MokoJoomOpenGraph</name>
+		<element>pkg_mokoog</element>
+		<type>package</type>
+		<description>Open Graph, Twitter Card, and social sharing meta tags for articles, categories, and pages.</description>
+		<icon>icon-share-alt</icon>
+		<category>Components</category>
+		<article>https://mokoconsulting.tech/support/products/mokojoomopengraph</article>
+		<updateserver>https://git.mokoconsulting.tech/MokoConsulting/MokoJoomOpenGraph/raw/branch/dev/updates.xml</updateserver>
+	</extension>
 </catalog>

source/packages/com_mokowaas/admin/sql/install.mysql.sql

@@ -133,4 +133,3 @@ INSERT IGNORE INTO `#__mokowaas_retention_policies` (`id`, `content_type`, `rete
 (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)');
-

source/packages/com_mokowaas/admin/sql/uninstall.mysql.sql

@@ -1,13 +0,0 @@
---
--- MokoWaaS component uninstall — drop all tables
---
-DROP TABLE IF EXISTS `#__mokowaas_download_keys`;
-DROP TABLE IF EXISTS `#__mokowaas_retention_policies`;
-DROP TABLE IF EXISTS `#__mokowaas_data_requests`;
-DROP TABLE IF EXISTS `#__mokowaas_consent_log`;
-DROP TABLE IF EXISTS `#__mokowaas_waf_log`;
-DROP TABLE IF EXISTS `#__mokowaas_ticket_automation`;
-DROP TABLE IF EXISTS `#__mokowaas_ticket_canned`;
-DROP TABLE IF EXISTS `#__mokowaas_ticket_replies`;
-DROP TABLE IF EXISTS `#__mokowaas_tickets`;
-DROP TABLE IF EXISTS `#__mokowaas_ticket_categories`;

source/packages/com_mokowaas/admin/sql/updates/mysql/02.34.28.sql

@@ -1,2 +0,0 @@
--- Remove download_keys table (feature reverted — preflight handles key preservation)
-DROP TABLE IF EXISTS `#__mokowaas_download_keys`;

source/packages/com_mokowaas/admin/src/Controller/DisplayController.php

@@ -80,96 +80,6 @@ class DisplayController extends BaseController
 	}
 
 	// ==================================================================
-	// Heartbeat
-	// ==================================================================
-
-	public function sendHeartbeat()
-	{
-		Session::checkToken() or die(Text::_('JINVALID_TOKEN'));
-
-		try
-		{
-			$monitorPlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokowaas_monitor');
-
-			if (!$monitorPlugin)
-			{
-				$this->jsonResponse(['success' => false, 'message' => 'Monitor plugin not enabled.']);
-
-				return;
-			}
-
-			$params = new \Joomla\Registry\Registry($monitorPlugin->params);
-			$baseUrl = rtrim($params->get('base_url', ''), '/');
-
-			if (empty($baseUrl))
-			{
-				$this->jsonResponse(['success' => false, 'message' => 'MokoWaaSBase URL not configured in monitor plugin.']);
-
-				return;
-			}
-
-			$corePlugin = \Joomla\CMS\Plugin\PluginHelper::getPlugin('system', 'mokowaas');
-			$coreParams = new \Joomla\Registry\Registry($corePlugin ? $corePlugin->params : '{}');
-			$healthToken = $coreParams->get('health_api_token', '');
-
-			if (empty($healthToken))
-			{
-				$this->jsonResponse(['success' => false, 'message' => 'Health token not configured.']);
-
-				return;
-			}
-
-			$siteUrl = rtrim(\Joomla\CMS\Uri\Uri::root(), '/');
-			$domain  = parse_url($siteUrl, PHP_URL_HOST) ?: '';
-
-			$payload = json_encode([
-				'token'            => $healthToken,
-				'domain'           => $domain,
-				'site_name'        => Factory::getConfig()->get('sitename', 'Joomla'),
-				'site_url'         => $siteUrl,
-				'joomla_version'   => (new \Joomla\CMS\Version())->getShortVersion(),
-				'php_version'      => PHP_VERSION,
-			], JSON_UNESCAPED_SLASHES);
-
-			$endpoint = $baseUrl . '/api/index.php/v1/mokowaasbase/heartbeat';
-
-			$ch = curl_init($endpoint);
-			curl_setopt_array($ch, [
-				CURLOPT_POST           => true,
-				CURLOPT_HTTPHEADER     => ['Content-Type: application/json'],
-				CURLOPT_POSTFIELDS     => $payload,
-				CURLOPT_RETURNTRANSFER => true,
-				CURLOPT_TIMEOUT        => 15,
-				CURLOPT_FOLLOWLOCATION => true,
-				CURLOPT_SSL_VERIFYPEER => false,
-			]);
-
-			$response = curl_exec($ch);
-			$code     = (int) curl_getinfo($ch, CURLINFO_HTTP_CODE);
-			$error    = curl_error($ch);
-			curl_close($ch);
-
-			if ($error)
-			{
-				$this->jsonResponse(['success' => false, 'message' => 'Connection failed: ' . $error]);
-			}
-			elseif ($code >= 200 && $code < 300)
-			{
-				$body = json_decode($response, true);
-				$this->jsonResponse(['success' => true, 'message' => 'Heartbeat sent: ' . ($body['status'] ?? 'ok')]);
-			}
-			else
-			{
-				$body = json_decode($response, true);
-				$this->jsonResponse(['success' => false, 'message' => 'HTTP ' . $code . ': ' . ($body['error'] ?? $body['message'] ?? 'Unknown')]);
-			}
-		}
-		catch (\Throwable $e)
-		{
-			$this->jsonResponse(['success' => false, 'message' => 'Error: ' . $e->getMessage()]);
-		}
-	}
-
 	// Cache
 	// ==================================================================
 

source/packages/com_mokowaas/admin/src/Model/ExtensionsModel.php

@@ -48,12 +48,6 @@ class ExtensionsModel extends BaseDatabaseModel
 			$remoteVersion = $release['version'] ?? '';
 			$downloadUrl   = $release['download_url'] ?? '';
 
-			// Skip extensions with no release available and not installed
-			if (empty($remoteVersion) && $localVersion === null)
-			{
-				continue;
-			}
-
 			$status = 'not_installed';
 
 			if ($localVersion !== null)
@@ -68,9 +62,6 @@ class ExtensionsModel extends BaseDatabaseModel
 
 			$extensionId = $this->getExtensionId($entry['element']);
 
-			$needsDlid = $release['needs_dlid'] ?? false;
-			$hasDlid   = $needsDlid && $extensionId ? $this->hasDownloadKey($entry['element']) : false;
-
 			$packages[] = (object) [
 				'label'          => $entry['name'],
 				'description'    => $entry['description'],
@@ -85,9 +76,6 @@ class ExtensionsModel extends BaseDatabaseModel
 				'article_url'    => $entry['article'] ?? '',
 				'protected'      => ($entry['protected'] ?? 'false') === 'true',
 				'extension_id'   => $extensionId,
-				'needs_dlid'     => $needsDlid,
-				'has_dlid'       => $hasDlid,
-				'has_stable'     => $release['has_stable'] ?? false,
 			];
 		}
 
@@ -238,36 +226,13 @@ class ExtensionsModel extends BaseDatabaseModel
 			return [];
 		}
 
-		// Determine site's update channel preference
+		// Find the highest version entry
-		$channel   = 'dev'; // default to dev — show everything
-		$hasStable = false;
-		$hasDev    = false;
-
-		// Find the best version entry, preferring the site's channel
 		$bestVersion = '0.0.0';
 		$downloadUrl = '';
-		$needsDlid   = false;
 
 		foreach ($xml->update as $update)
 		{
 			$ver = (string) ($update->version ?? '');
-			$tag = '';
-
-			// Check for <tags><tag> element
-			if (isset($update->tags->tag))
-			{
-				$tag = (string) $update->tags->tag;
-			}
-
-			if ($tag === 'stable')
-			{
-				$hasStable = true;
-			}
-
-			if ($tag === 'dev')
-			{
-				$hasDev = true;
-			}
 
 			if ($ver === '' || version_compare($ver, $bestVersion, '<='))
 			{
@@ -276,15 +241,10 @@ class ExtensionsModel extends BaseDatabaseModel
 
 			$bestVersion = $ver;
 
+			// Get download URL from <downloads><downloadurl>
 			if (isset($update->downloads->downloadurl))
 			{
 				$downloadUrl = (string) $update->downloads->downloadurl;
-
-				// Check if download URL contains dlid placeholder
-				if (str_contains($downloadUrl, 'dlid='))
-				{
-					$needsDlid = true;
-				}
 			}
 		}
 
@@ -296,9 +256,6 @@ class ExtensionsModel extends BaseDatabaseModel
 		return [
 			'version'      => $bestVersion,
 			'download_url' => $downloadUrl,
-			'has_stable'   => $hasStable,
-			'has_dev'      => $hasDev,
-			'needs_dlid'   => $needsDlid,
 		];
 	}
 
@@ -342,33 +299,6 @@ class ExtensionsModel extends BaseDatabaseModel
 		return $versions;
 	}
 
-	/**
-	 * Check if an extension has a download key configured.
-	 */
-	private function hasDownloadKey(string $element): bool
-	{
-		try
-		{
-			$db = $this->getDatabase();
-
-			$query = $db->getQuery(true)
-				->select($db->quoteName('us.extra_query'))
-				->from($db->quoteName('#__update_sites', 'us'))
-				->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON us.update_site_id = use.update_site_id')
-				->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
-				->where($db->quoteName('e.element') . ' = ' . $db->quote($element));
-
-			$db->setQuery($query, 0, 1);
-			$extraQuery = (string) $db->loadResult();
-
-			return !empty($extraQuery) && str_contains($extraQuery, 'dlid=');
-		}
-		catch (\Throwable $e)
-		{
-			return false;
-		}
-	}
-
 	/**
 	 * Get the extension_id for an element (for uninstall links).
 	 *

source/packages/com_mokowaas/admin/tmpl/extensions/default.php

@@ -44,7 +44,7 @@ $statusBadge = [
 		<?php
 			$badge = $statusBadge[$pkg->status] ?? $statusBadge['not_installed'];
 		?>
-		<div class="col-12 <?php echo \count($pkgs) === 1 ? '' : (\count($pkgs) === 2 ? 'col-md-6' : 'col-md-6 col-xl-4'); ?>">
+		<div class="col-12 col-md-6 col-xl-4">
 			<div class="card h-100">
 				<div class="card-body d-flex flex-column">
 					<div class="d-flex align-items-start justify-content-between mb-2">
@@ -60,14 +60,6 @@ $statusBadge = [
 
 					<p class="card-text text-muted flex-grow-1"><?php echo htmlspecialchars($pkg->description); ?></p>
 
-					<?php if (!empty($pkg->needs_dlid) && !$pkg->has_dlid && $pkg->status !== 'not_installed'): ?>
-					<div class="alert alert-danger py-1 px-2 mb-2" style="font-size:0.8rem;">
-						<span class="icon-exclamation-triangle" aria-hidden="true"></span>
-						Download key missing — updates will fail.
-						<a href="index.php?option=com_installer&view=updatesites" class="alert-link">Configure</a>
-					</div>
-					<?php endif; ?>
-
 					<div class="d-flex align-items-center justify-content-between mt-auto pt-2 border-top">
 						<div class="small text-muted">
 							<?php if ($pkg->local_version): ?>
@@ -90,9 +82,7 @@ $statusBadge = [
 							data-url="<?php echo Route::_('index.php?option=com_mokowaas&task=display.installExtension&format=json'); ?>"
 							data-download="<?php echo htmlspecialchars($pkg->download_url); ?>"
 							data-token="<?php echo $token; ?>"
-							data-label="<?php echo htmlspecialchars($pkg->label); ?>"
+							data-label="<?php echo htmlspecialchars($pkg->label); ?>">
-							data-needs-dlid="<?php echo $pkg->needs_dlid ? '1' : '0'; ?>"
-							data-element="<?php echo htmlspecialchars($pkg->element); ?>">
 							<span class="icon-refresh" aria-hidden="true"></span>
 							Update to <?php echo htmlspecialchars($pkg->remote_version); ?>
 						</button>
@@ -101,9 +91,7 @@ $statusBadge = [
 								data-url="<?php echo Route::_('index.php?option=com_mokowaas&task=display.installExtension&format=json'); ?>"
 								data-download="<?php echo htmlspecialchars($pkg->download_url); ?>"
 								data-token="<?php echo $token; ?>"
-								data-label="<?php echo htmlspecialchars($pkg->label); ?>"
+								data-label="<?php echo htmlspecialchars($pkg->label); ?>">
-								data-needs-dlid="<?php echo $pkg->needs_dlid ? '1' : '0'; ?>"
-								data-element="<?php echo htmlspecialchars($pkg->element); ?>">
 								<span class="icon-download" aria-hidden="true"></span>
 								Install
 							</button>
@@ -162,37 +150,15 @@ document.addEventListener('DOMContentLoaded', function() {
 			var token = el.dataset.token;
 			var label = el.dataset.label;
 
-			var needsDlid = el.dataset.needsDlid === '1';
-			var dlid = '';
-
-			if (needsDlid) {
-				dlid = prompt('Enter download key for ' + label + ':', '');
-				if (dlid === null) return;
-				if (!dlid.trim()) {
-					Joomla.renderMessages({error: ['Download key is required for ' + label]});
-					return;
-				}
-			}
-
 			if (!confirm('Install ' + label + '?')) return;
 
 			el.disabled = true;
 			var origHtml = el.textContent;
 			el.textContent = ' Installing...';
 
-			// Append dlid to download URL if provided
-			var finalUrl = downloadUrl;
-			if (dlid) {
-				finalUrl += (downloadUrl.indexOf('?') !== -1 ? '&' : '?') + 'dlid=' + encodeURIComponent(dlid.trim());
-			}
-
 			var fd = new FormData();
-			fd.append('download_url', finalUrl);
+			fd.append('download_url', downloadUrl);
 			fd.append(token, '1');
-			if (dlid) {
-				fd.append('dlid', dlid.trim());
-				fd.append('element', el.dataset.element || '');
-			}
 
 			fetch(url, {
 				method: 'POST',

source/packages/com_mokowaas/media/css/portal.css

@@ -1,38 +0,0 @@
-/**
- * MokoWaaS+ERP Customer Portal styles
- * @since 02.34.16
- */
-
-.mokowaas-portal h2,
-.mokowaas-portal-orders h2,
-.mokowaas-portal-invoices h2,
-.mokowaas-portal-license h2 {
-	color: #1a2744;
-	font-weight: 700;
-}
-
-/* Signing page */
-.mokowaas-sign-page {
-	max-width: 800px;
-	margin: 0 auto;
-}
-
-#signature-canvas {
-	border: 1px solid #dee2e6;
-	border-radius: 4px;
-	background: #fff;
-}
-
-/* Verification page */
-.mokowaas-verify-page {
-	max-width: 900px;
-	margin: 0 auto;
-}
-
-/* Portal cards */
-.mokowaas-portal .card {
-	transition: box-shadow 0.15s;
-}
-.mokowaas-portal .card:hover {
-	box-shadow: 0 4px 12px rgba(0,0,0,0.1);
-}

source/packages/com_mokowaas/media/js/signature-pad.js

@@ -1,162 +0,0 @@
-/**
- * MokoWaaS+ERP Signature Pad — HTML5 Canvas drawing for e-signature capture.
- * Touch-friendly, works on mobile/tablet/desktop.
- * @since 02.34.16
- */
-document.addEventListener('DOMContentLoaded', function () {
-	'use strict';
-
-	var canvas = document.getElementById('signature-canvas');
-	if (!canvas) { return; }
-
-	var ctx = canvas.getContext('2d');
-	var drawing = false;
-	var hasSigned = false;
-
-	// High-DPI support
-	var dpr = window.devicePixelRatio || 1;
-	var rect = canvas.getBoundingClientRect();
-	canvas.width = rect.width * dpr;
-	canvas.height = rect.height * dpr;
-	ctx.scale(dpr, dpr);
-	ctx.lineWidth = 2;
-	ctx.lineCap = 'round';
-	ctx.strokeStyle = '#000';
-
-	function getPos(e) {
-		var r = canvas.getBoundingClientRect();
-		var touch = e.touches ? e.touches[0] : e;
-		return { x: touch.clientX - r.left, y: touch.clientY - r.top };
-	}
-
-	canvas.addEventListener('mousedown', function (e) { drawing = true; ctx.beginPath(); var p = getPos(e); ctx.moveTo(p.x, p.y); });
-	canvas.addEventListener('mousemove', function (e) { if (!drawing) return; var p = getPos(e); ctx.lineTo(p.x, p.y); ctx.stroke(); hasSigned = true; });
-	canvas.addEventListener('mouseup', function () { drawing = false; });
-	canvas.addEventListener('mouseleave', function () { drawing = false; });
-
-	canvas.addEventListener('touchstart', function (e) { e.preventDefault(); drawing = true; ctx.beginPath(); var p = getPos(e); ctx.moveTo(p.x, p.y); }, { passive: false });
-	canvas.addEventListener('touchmove', function (e) { e.preventDefault(); if (!drawing) return; var p = getPos(e); ctx.lineTo(p.x, p.y); ctx.stroke(); hasSigned = true; }, { passive: false });
-	canvas.addEventListener('touchend', function () { drawing = false; });
-
-	// Clear
-	var clearBtn = document.getElementById('clear-signature');
-	if (clearBtn) {
-		clearBtn.addEventListener('click', function () {
-			ctx.clearRect(0, 0, canvas.width, canvas.height);
-			hasSigned = false;
-		});
-	}
-
-	// Submit
-	var form = document.getElementById('signing-form');
-	if (form) {
-		form.addEventListener('submit', function (e) {
-			e.preventDefault();
-
-			if (!hasSigned) {
-				alert('Please draw your signature before submitting.');
-				return;
-			}
-
-			var consentBox = document.getElementById('consent-checkbox');
-			if (consentBox && !consentBox.checked) {
-				alert('You must accept the e-signature consent agreement.');
-				return;
-			}
-
-			var token = form.dataset.token;
-			var signatureData = canvas.toDataURL('image/png');
-			var basePath = (Joomla.getOptions('system.paths') || {}).baseFull || '';
-
-			var body = {
-				token: token,
-				signature: signatureData,
-				signature_type: 'draw'
-			};
-
-			// Geolocation
-			if (navigator.geolocation) {
-				navigator.geolocation.getCurrentPosition(function (pos) {
-					body.geo_lat = pos.coords.latitude;
-					body.geo_lon = pos.coords.longitude;
-					submitSignature(basePath, body);
-				}, function () {
-					submitSignature(basePath, body);
-				}, { timeout: 5000 });
-			} else {
-				submitSignature(basePath, body);
-			}
-		});
-	}
-
-	function submitSignature(basePath, body) {
-		var btn = document.getElementById('btn-sign');
-		btn.disabled = true;
-		btn.textContent = 'Submitting...';
-
-		// If consent needed, send consent first
-		var consentBox = document.getElementById('consent-checkbox');
-		var consentPromise = Promise.resolve();
-
-		if (consentBox) {
-			consentPromise = fetch(basePath + 'api/index.php/v1/mokowaas/erp/esign/public', {
-				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify({ token: body.token, accepted: true, action: 'consent' })
-			}).then(function (r) { return r.json(); });
-		}
-
-		consentPromise.then(function () {
-			return fetch(basePath + 'api/index.php/v1/mokowaas/erp/esign/public', {
-				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify(body)
-			});
-		})
-		.then(function (r) { return r.json(); })
-		.then(function (result) {
-			if (result.ok) {
-				document.querySelector('.mokowaas-sign-page').textContent = '';
-				var success = document.createElement('div');
-				success.className = 'alert alert-success fs-5 text-center py-5';
-				success.textContent = 'Document signed successfully. Thank you!';
-				document.querySelector('.mokowaas-sign-page').appendChild(success);
-			} else {
-				alert(result.error || 'Signing failed. Please try again.');
-				btn.disabled = false;
-				btn.textContent = 'Sign Document';
-			}
-		})
-		.catch(function (err) {
-			alert('Network error: ' + err.message);
-			btn.disabled = false;
-			btn.textContent = 'Sign Document';
-		});
-	}
-
-	// Decline
-	var declineBtn = document.getElementById('btn-decline');
-	if (declineBtn) {
-		declineBtn.addEventListener('click', function () {
-			var reason = prompt('Reason for declining (optional):');
-			if (reason === null) { return; }
-
-			var token = form.dataset.token;
-			var basePath = (Joomla.getOptions('system.paths') || {}).baseFull || '';
-
-			fetch(basePath + 'api/index.php/v1/mokowaas/erp/esign/public', {
-				method: 'POST',
-				headers: { 'Content-Type': 'application/json' },
-				body: JSON.stringify({ token: token, reason: reason, action: 'decline' })
-			})
-			.then(function (r) { return r.json(); })
-			.then(function (result) {
-				document.querySelector('.mokowaas-sign-page').textContent = '';
-				var msg = document.createElement('div');
-				msg.className = 'alert alert-warning fs-5 text-center py-5';
-				msg.textContent = 'Document declined.';
-				document.querySelector('.mokowaas-sign-page').appendChild(msg);
-			});
-		});
-	}
-});

source/packages/com_mokowaas/mokowaas.xml

@@ -20,23 +20,11 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+	<version>02.34.15</version>
 	<description>MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints.</description>
 
 	<namespace path="src">Moko\Component\MokoWaaS</namespace>
 
-	<install>
-		<sql><file driver="mysql" charset="utf8">sql/install.mysql.sql</file></sql>
-	</install>
-	<uninstall>
-		<sql><file driver="mysql" charset="utf8">sql/uninstall.mysql.sql</file></sql>
-	</uninstall>
-	<update>
-		<schemas>
-			<schemapath type="mysql">sql/updates/mysql</schemapath>
-		</schemas>
-	</update>
-
 	<administration>
 		<menu img="class:cogs">MokoWaaS</menu>
 		<submenu>

source/packages/com_mokowaas/site/src/Model/PortalModel.php

@@ -1,102 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\Model;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\Model\BaseDatabaseModel;
-
-/**
- * Portal Model — resolves logged-in user to ERP contact and loads their data.
- */
-class PortalModel extends BaseDatabaseModel
-{
-	/**
-	 * Get the ERP contact ID for the current logged-in user (matched by email).
-	 */
-	public function getContactId(): int
-	{
-		$user = Factory::getUser();
-		if ($user->guest) { return 0; }
-
-		$db = $this->getDatabase();
-		$db->setQuery(
-			$db->getQuery(true)
-				->select('id')
-				->from($db->quoteName('#__contact_details'))
-				->where($db->quoteName('email_to') . ' = ' . $db->quote($user->email))
-				->where($db->quoteName('published') . ' = 1')
-				->setLimit(1)
-		);
-
-		return (int) $db->loadResult();
-	}
-
-	public function getDashboard(int $contactId): object
-	{
-		$db = $this->getDatabase();
-		$dash = new \stdClass();
-
-		// Open orders
-		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->where($db->quoteName('status') . ' NOT IN (' . $db->quote('delivered') . ',' . $db->quote('cancelled') . ')'));
-		$dash->open_orders = (int) $db->loadResult();
-
-		// Unpaid invoices
-		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->select('COALESCE(SUM(total - amount_paid), 0) AS total_due')->from($db->quoteName('#__mokowaas_erp_invoices'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->where($db->quoteName('status') . ' IN (' . $db->quote('sent') . ',' . $db->quote('partial') . ',' . $db->quote('overdue') . ')'));
-		$inv = $db->loadObject();
-		$dash->unpaid_invoices = (int) $inv->{'COUNT(*)'};
-		$dash->total_due = (float) $inv->total_due;
-
-		// Open tickets
-		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__mokowaas_tickets'))->where($db->quoteName('created_by') . ' = ' . (int) Factory::getUser()->id)->where($db->quoteName('status') . ' NOT IN (' . $db->quote('closed') . ',' . $db->quote('resolved') . ')'));
-		$dash->open_tickets = (int) $db->loadResult();
-
-		// Pending signatures
-		$db->setQuery($db->getQuery(true)->select('COUNT(*)')->from($db->quoteName('#__mokowaas_erp_esign_signers'))->where($db->quoteName('email') . ' = ' . $db->quote(Factory::getUser()->email))->where($db->quoteName('status') . ' IN (' . $db->quote('pending') . ',' . $db->quote('viewed') . ')'));
-		$dash->pending_signatures = (int) $db->loadResult();
-
-		// Recent orders
-		$db->setQuery($db->getQuery(true)->select('id, ref, status, total, created')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->order('created DESC'), 0, 5);
-		$dash->recent_orders = $db->loadObjectList() ?: [];
-
-		return $dash;
-	}
-
-	public function getOrders(int $contactId, int $limit = 25): array
-	{
-		$db = $this->getDatabase();
-		$db->setQuery($db->getQuery(true)->select('*')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->order('created DESC'), 0, $limit);
-		return $db->loadObjectList() ?: [];
-	}
-
-	public function getOrder(int $contactId, int $id): ?object
-	{
-		$db = $this->getDatabase();
-		$db->setQuery($db->getQuery(true)->select('*')->from($db->quoteName('#__mokowaas_erp_orders'))->where($db->quoteName('id') . ' = ' . $id)->where($db->quoteName('contact_id') . ' = ' . $contactId));
-		$order = $db->loadObject();
-		if (!$order) { return null; }
-
-		$db->setQuery($db->getQuery(true)->select('oi.*, p.sku')->from($db->quoteName('#__mokowaas_erp_order_items', 'oi'))->join('LEFT', $db->quoteName('#__mokowaas_erp_products', 'p') . ' ON p.id = oi.product_id')->where($db->quoteName('oi.order_id') . ' = ' . $id)->order('oi.position ASC'));
-		$order->items = $db->loadObjectList() ?: [];
-		return $order;
-	}
-
-	public function getInvoices(int $contactId, int $limit = 25): array
-	{
-		$db = $this->getDatabase();
-		$db->setQuery($db->getQuery(true)->select('*, (total - amount_paid) AS balance_due')->from($db->quoteName('#__mokowaas_erp_invoices'))->where($db->quoteName('contact_id') . ' = ' . $contactId)->order('created DESC'), 0, $limit);
-		return $db->loadObjectList() ?: [];
-	}
-
-	public function getInvoice(int $contactId, int $id): ?object
-	{
-		$db = $this->getDatabase();
-		$db->setQuery($db->getQuery(true)->select('*, (total - amount_paid) AS balance_due')->from($db->quoteName('#__mokowaas_erp_invoices'))->where($db->quoteName('id') . ' = ' . $id)->where($db->quoteName('contact_id') . ' = ' . $contactId));
-		$inv = $db->loadObject();
-		if (!$inv) { return null; }
-
-		$db->setQuery($db->getQuery(true)->select('ii.*, p.sku')->from($db->quoteName('#__mokowaas_erp_invoice_items', 'ii'))->join('LEFT', $db->quoteName('#__mokowaas_erp_products', 'p') . ' ON p.id = ii.product_id')->where($db->quoteName('ii.invoice_id') . ' = ' . $id)->order('ii.position ASC'));
-		$inv->items = $db->loadObjectList() ?: [];
-		return $inv;
-	}
-}

source/packages/com_mokowaas/site/src/View/Invoice/HtmlView.php

@@ -1,28 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\Invoice;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-class HtmlView extends BaseHtmlView
-{
-	protected $invoice;
-
-	public function display($tpl = null)
-	{
-		$user = Factory::getUser();
-		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
-
-		$model = $this->getModel('Portal');
-		$contactId = $model->getContactId();
-		$this->invoice = $contactId ? $model->getInvoice($contactId, Factory::getApplication()->getInput()->getInt('id', 0)) : null;
-
-		if (!$this->invoice) { throw new \Exception('Invoice not found', 404); }
-
-		Factory::getApplication()->getDocument()->getWebAssetManager()
-			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/src/View/Invoices/HtmlView.php

@@ -1,26 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\Invoices;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-class HtmlView extends BaseHtmlView
-{
-	protected $items = [];
-
-	public function display($tpl = null)
-	{
-		$user = Factory::getUser();
-		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
-
-		$model = $this->getModel('Portal');
-		$contactId = $model->getContactId();
-		$this->items = $contactId ? $model->getInvoices($contactId) : [];
-
-		Factory::getApplication()->getDocument()->getWebAssetManager()
-			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/src/View/License/HtmlView.php

@@ -1,32 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\License;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-class HtmlView extends BaseHtmlView
-{
-	protected $licenseData;
-
-	public function display($tpl = null)
-	{
-		$user = Factory::getUser();
-		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
-
-		// License data would come from plg_system_mokowaas_license cache
-		// For now, placeholder structure
-		$this->licenseData = (object) [
-			'valid' => true,
-			'package' => 'MokoWaaS+ERP',
-			'services' => ['base', 'erp'],
-			'expiry' => null,
-			'dlid' => '',
-		];
-
-		Factory::getApplication()->getDocument()->getWebAssetManager()
-			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/src/View/Order/HtmlView.php

@@ -1,28 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\Order;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-class HtmlView extends BaseHtmlView
-{
-	protected $order;
-
-	public function display($tpl = null)
-	{
-		$user = Factory::getUser();
-		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
-
-		$model = $this->getModel('Portal');
-		$contactId = $model->getContactId();
-		$this->order = $contactId ? $model->getOrder($contactId, Factory::getApplication()->getInput()->getInt('id', 0)) : null;
-
-		if (!$this->order) { throw new \Exception('Order not found', 404); }
-
-		Factory::getApplication()->getDocument()->getWebAssetManager()
-			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/src/View/Orders/HtmlView.php

@@ -1,26 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\Orders;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-class HtmlView extends BaseHtmlView
-{
-	protected $items = [];
-
-	public function display($tpl = null)
-	{
-		$user = Factory::getUser();
-		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
-
-		$model = $this->getModel('Portal');
-		$contactId = $model->getContactId();
-		$this->items = $contactId ? $model->getOrders($contactId) : [];
-
-		Factory::getApplication()->getDocument()->getWebAssetManager()
-			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/src/View/Portal/HtmlView.php

@@ -1,28 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\Portal;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-class HtmlView extends BaseHtmlView
-{
-	protected $dashboard;
-	protected $contactId = 0;
-
-	public function display($tpl = null)
-	{
-		$user = Factory::getUser();
-		if ($user->guest) { Factory::getApplication()->redirect('index.php?option=com_users&view=login'); return; }
-
-		$model = $this->getModel();
-		$this->contactId = $model->getContactId();
-		$this->dashboard = $this->contactId ? $model->getDashboard($this->contactId) : null;
-
-		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/src/View/Sign/HtmlView.php

@@ -1,41 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\Sign;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-/**
- * Public signing page — token-based, no login required.
- */
-class HtmlView extends BaseHtmlView
-{
-	protected $signer;
-	protected $request;
-
-	public function display($tpl = null)
-	{
-		$token = Factory::getApplication()->getInput()->get('token', '', 'ALNUM');
-
-		if ($token && \strlen($token) === 128)
-		{
-			$db = Factory::getDbo();
-			$db->setQuery(
-				$db->getQuery(true)
-					->select('s.*, r.title AS request_title, r.description AS request_description, r.status AS request_status, r.require_selfie, r.require_id, r.require_consent')
-					->from($db->quoteName('#__mokowaas_erp_esign_signers', 's'))
-					->join('INNER', $db->quoteName('#__mokowaas_erp_esign_requests', 'r') . ' ON r.id = s.request_id')
-					->where($db->quoteName('s.token') . ' = ' . $db->quote($token))
-			);
-			$this->signer = $db->loadObject();
-			$this->request = $this->signer ? (object) ['title' => $this->signer->request_title, 'description' => $this->signer->request_description, 'status' => $this->signer->request_status] : null;
-		}
-
-		$wa = Factory::getApplication()->getDocument()->getWebAssetManager();
-		$wa->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-		$wa->registerAndUseScript('com_mokowaas.signature-pad', 'com_mokowaas/signature-pad.js', [], ['defer' => true]);
-
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/src/View/SignVerify/HtmlView.php

@@ -1,35 +0,0 @@
-<?php
-namespace Moko\Component\MokoWaaS\Site\View\SignVerify;
-
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\MVC\View\HtmlView as BaseHtmlView;
-
-class HtmlView extends BaseHtmlView
-{
-	protected $request;
-
-	public function display($tpl = null)
-	{
-		$hash = Factory::getApplication()->getInput()->get('hash', '', 'ALNUM');
-
-		if ($hash) {
-			$db = Factory::getDbo();
-			$db->setQuery($db->getQuery(true)->select('id, ref, title, status, date_creation, date_signature')->from($db->quoteName('#__mokowaas_erp_esign_requests'))->where($db->quoteName('verification_hash') . ' = ' . $db->quote($hash)));
-			$this->request = $db->loadObject();
-
-			if ($this->request) {
-				$db->setQuery($db->getQuery(true)->select('role, email, firstname, lastname, status, date_signed, ip_address, geo_country, geo_city')->from($db->quoteName('#__mokowaas_erp_esign_signers'))->where($db->quoteName('request_id') . ' = ' . (int) $this->request->id)->order('position ASC'));
-				$this->request->signers = $db->loadObjectList() ?: [];
-
-				$db->setQuery($db->getQuery(true)->select('code, label, ip, created')->from($db->quoteName('#__mokowaas_erp_esign_events'))->where($db->quoteName('request_id') . ' = ' . (int) $this->request->id)->order('created ASC'));
-				$this->request->events = $db->loadObjectList() ?: [];
-			}
-		}
-
-		Factory::getApplication()->getDocument()->getWebAssetManager()
-			->registerAndUseStyle('com_mokowaas.portal', 'com_mokowaas/portal.css');
-		parent::display($tpl);
-	}
-}

source/packages/com_mokowaas/site/tmpl/invoice/default.php

@@ -1,39 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-use Joomla\CMS\Router\Route;
-$inv = $this->invoice;
-?>
-<div class="mokowaas-portal-invoice">
-	<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoices'); ?>" class="btn btn-sm btn-outline-secondary mb-3"><span class="icon-arrow-left"></span> My Invoices</a>
-	<div class="card shadow-sm">
-		<div class="card-header d-flex justify-content-between">
-			<h3 class="mb-0 font-monospace"><?php echo $this->escape($inv->ref); ?></h3>
-			<span class="badge bg-<?php echo $inv->status === 'paid' ? 'success' : 'primary'; ?> fs-6"><?php echo ucfirst($inv->status); ?></span>
-		</div>
-		<div class="card-body">
-			<div class="row g-3 mb-3">
-				<div class="col-md-4"><div class="text-muted small">Due Date</div><div class="fw-bold"><?php echo $this->escape($inv->due_date ?? 'On receipt'); ?></div></div>
-				<div class="col-md-4"><div class="text-muted small">Balance Due</div><div class="fs-4 fw-bold <?php echo (float) $inv->balance_due > 0 ? 'text-danger' : 'text-success'; ?>">$<?php echo number_format((float) $inv->balance_due, 2); ?></div></div>
-				<div class="col-md-4"><div class="text-muted small">Created</div><div><?php echo $this->escape($inv->created); ?></div></div>
-			</div>
-			<table class="table table-sm">
-				<thead class="table-light"><tr><th>Description</th><th class="text-end">Qty</th><th class="text-end">Price</th><th class="text-end">Total</th></tr></thead>
-				<tbody>
-					<?php foreach ($inv->items as $item) : ?>
-					<tr>
-						<td><?php echo $this->escape($item->description); ?></td>
-						<td class="text-end"><?php echo number_format((float) $item->quantity, 2); ?></td>
-						<td class="text-end">$<?php echo number_format((float) $item->unit_price, 2); ?></td>
-						<td class="text-end fw-bold">$<?php echo number_format((float) $item->line_total, 2); ?></td>
-					</tr>
-					<?php endforeach; ?>
-				</tbody>
-				<tfoot class="table-light">
-					<tr><td colspan="3" class="text-end">Subtotal</td><td class="text-end">$<?php echo number_format((float) $inv->subtotal, 2); ?></td></tr>
-					<tr><td colspan="3" class="text-end">Tax</td><td class="text-end">$<?php echo number_format((float) $inv->tax_total, 2); ?></td></tr>
-					<tr><td colspan="3" class="text-end fw-bold fs-5">Total</td><td class="text-end fw-bold fs-5">$<?php echo number_format((float) $inv->total, 2); ?></td></tr>
-				</tfoot>
-			</table>
-		</div>
-	</div>
-</div>

source/packages/com_mokowaas/site/tmpl/invoices/default.php

@@ -1,31 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-use Joomla\CMS\Router\Route;
-?>
-<div class="mokowaas-portal-invoices">
-	<div class="d-flex justify-content-between mb-3">
-		<h2>My Invoices</h2>
-		<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=portal'); ?>" class="btn btn-sm btn-outline-secondary"><span class="icon-arrow-left"></span> Portal</a>
-	</div>
-	<div class="card shadow-sm"><div class="card-body p-0">
-		<table class="table table-hover mb-0">
-			<thead class="table-light"><tr><th>Ref</th><th>Status</th><th class="text-end">Total</th><th class="text-end">Paid</th><th class="text-end">Balance</th><th>Due</th><th>Date</th></tr></thead>
-			<tbody>
-				<?php foreach ($this->items as $inv) :
-					$isOverdue = $inv->due_date && $inv->due_date < date('Y-m-d') && \in_array($inv->status, ['sent', 'partial', 'overdue']);
-				?>
-				<tr class="<?php echo $isOverdue ? 'table-warning' : ''; ?>">
-					<td><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoice&id=' . (int) $inv->id); ?>" class="font-monospace fw-bold"><?php echo $this->escape($inv->ref); ?></a></td>
-					<td><span class="badge bg-<?php echo $inv->status === 'paid' ? 'success' : ($isOverdue ? 'danger' : 'primary'); ?>"><?php echo ucfirst($inv->status); ?></span></td>
-					<td class="text-end">$<?php echo number_format((float) $inv->total, 2); ?></td>
-					<td class="text-end text-success">$<?php echo number_format((float) $inv->amount_paid, 2); ?></td>
-					<td class="text-end <?php echo (float) $inv->balance_due > 0 ? 'text-danger fw-bold' : ''; ?>">$<?php echo number_format((float) $inv->balance_due, 2); ?></td>
-					<td class="small <?php echo $isOverdue ? 'text-danger fw-bold' : 'text-muted'; ?>"><?php echo $this->escape($inv->due_date ?? '—'); ?></td>
-					<td class="small text-muted"><?php echo $this->escape($inv->created); ?></td>
-				</tr>
-				<?php endforeach; ?>
-				<?php if (empty($this->items)) : ?><tr><td colspan="7" class="text-center text-muted py-4">No invoices found</td></tr><?php endif; ?>
-			</tbody>
-		</table>
-	</div></div>
-</div>

source/packages/com_mokowaas/site/tmpl/license/default.php

@@ -1,58 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Session\Session;
-
-$lic = $this->licenseData;
-?>
-<div class="mokowaas-portal-license">
-	<div class="d-flex justify-content-between mb-3">
-		<h2>License & Subscription</h2>
-		<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=portal'); ?>" class="btn btn-sm btn-outline-secondary"><span class="icon-arrow-left"></span> Portal</a>
-	</div>
-
-	<div class="card shadow-sm mb-3">
-		<div class="card-header"><h5 class="mb-0">Current License</h5></div>
-		<div class="card-body">
-			<div class="row g-3">
-				<div class="col-md-4">
-					<div class="text-muted small">Package</div>
-					<div class="fs-5 fw-bold"><?php echo $this->escape($lic->package); ?></div>
-				</div>
-				<div class="col-md-4">
-					<div class="text-muted small">Status</div>
-					<div><span class="badge bg-<?php echo $lic->valid ? 'success' : 'danger'; ?> fs-6"><?php echo $lic->valid ? 'Active' : 'Invalid'; ?></span></div>
-				</div>
-				<div class="col-md-4">
-					<div class="text-muted small">Expires</div>
-					<div class="fw-bold"><?php echo $lic->expiry ? $this->escape($lic->expiry) : 'No expiry'; ?></div>
-				</div>
-			</div>
-
-			<?php if (!empty($lic->services)) : ?>
-			<hr>
-			<div class="text-muted small mb-2">Active Services</div>
-			<div class="d-flex gap-2 flex-wrap">
-				<?php foreach ($lic->services as $svc) : ?>
-				<span class="badge bg-primary"><?php echo strtoupper($this->escape($svc)); ?></span>
-				<?php endforeach; ?>
-			</div>
-			<?php endif; ?>
-		</div>
-	</div>
-
-	<div class="card shadow-sm">
-		<div class="card-header"><h5 class="mb-0">Update License Key</h5></div>
-		<div class="card-body">
-			<form method="post" action="<?php echo Route::_('index.php?option=com_mokowaas&task=saveLicense'); ?>">
-				<div class="mb-3">
-					<label class="form-label">Download Key (DLID)</label>
-					<input type="text" name="dlid" class="form-control font-monospace" placeholder="Enter your license key" value="<?php echo $this->escape($lic->dlid); ?>">
-					<div class="form-text">Enter or update your license key to activate features.</div>
-				</div>
-				<input type="hidden" name="<?php echo Session::getFormToken(); ?>" value="1">
-				<button type="submit" class="btn btn-primary"><span class="icon-key"></span> Save License Key</button>
-			</form>
-		</div>
-	</div>
-</div>

source/packages/com_mokowaas/site/tmpl/order/default.php

@@ -1,35 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-use Joomla\CMS\Router\Route;
-$o = $this->order;
-?>
-<div class="mokowaas-portal-order">
-	<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=orders'); ?>" class="btn btn-sm btn-outline-secondary mb-3"><span class="icon-arrow-left"></span> My Orders</a>
-	<div class="card shadow-sm">
-		<div class="card-header d-flex justify-content-between">
-			<h3 class="mb-0 font-monospace"><?php echo $this->escape($o->ref); ?></h3>
-			<span class="badge bg-primary fs-6"><?php echo ucfirst($o->status); ?></span>
-		</div>
-		<div class="card-body">
-			<table class="table table-sm">
-				<thead class="table-light"><tr><th>SKU</th><th>Description</th><th class="text-end">Qty</th><th class="text-end">Price</th><th class="text-end">Total</th></tr></thead>
-				<tbody>
-					<?php foreach ($o->items as $item) : ?>
-					<tr>
-						<td class="font-monospace small"><?php echo $this->escape($item->sku ?? ''); ?></td>
-						<td><?php echo $this->escape($item->description); ?></td>
-						<td class="text-end"><?php echo number_format((float) $item->quantity, 2); ?></td>
-						<td class="text-end">$<?php echo number_format((float) $item->unit_price, 2); ?></td>
-						<td class="text-end fw-bold">$<?php echo number_format((float) $item->line_total, 2); ?></td>
-					</tr>
-					<?php endforeach; ?>
-				</tbody>
-				<tfoot class="table-light">
-					<tr><td colspan="4" class="text-end">Subtotal</td><td class="text-end">$<?php echo number_format((float) $o->subtotal, 2); ?></td></tr>
-					<tr><td colspan="4" class="text-end">Tax</td><td class="text-end">$<?php echo number_format((float) $o->tax_total, 2); ?></td></tr>
-					<tr><td colspan="4" class="text-end fw-bold fs-5">Total</td><td class="text-end fw-bold fs-5">$<?php echo number_format((float) $o->total, 2); ?></td></tr>
-				</tfoot>
-			</table>
-		</div>
-	</div>
-</div>

source/packages/com_mokowaas/site/tmpl/orders/default.php

@@ -1,27 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-use Joomla\CMS\Router\Route;
-?>
-<div class="mokowaas-portal-orders">
-	<div class="d-flex justify-content-between mb-3">
-		<h2>My Orders</h2>
-		<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=portal'); ?>" class="btn btn-sm btn-outline-secondary"><span class="icon-arrow-left"></span> Portal</a>
-	</div>
-	<div class="card shadow-sm"><div class="card-body p-0">
-		<table class="table table-hover mb-0">
-			<thead class="table-light"><tr><th>Ref</th><th>Status</th><th>Payment</th><th class="text-end">Total</th><th>Date</th></tr></thead>
-			<tbody>
-				<?php foreach ($this->items as $order) : ?>
-				<tr>
-					<td><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=order&id=' . (int) $order->id); ?>" class="font-monospace fw-bold"><?php echo $this->escape($order->ref); ?></a></td>
-					<td><span class="badge bg-primary"><?php echo ucfirst($order->status); ?></span></td>
-					<td><span class="badge bg-<?php echo $order->payment_status === 'paid' ? 'success' : 'warning'; ?>"><?php echo ucfirst($order->payment_status); ?></span></td>
-					<td class="text-end fw-bold">$<?php echo number_format((float) $order->total, 2); ?></td>
-					<td class="small text-muted"><?php echo $this->escape($order->created); ?></td>
-				</tr>
-				<?php endforeach; ?>
-				<?php if (empty($this->items)) : ?><tr><td colspan="5" class="text-center text-muted py-4">No orders found</td></tr><?php endif; ?>
-			</tbody>
-		</table>
-	</div></div>
-</div>

source/packages/com_mokowaas/site/tmpl/portal/default.php

@@ -1,96 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-use Joomla\CMS\Router\Route;
-
-$dash = $this->dashboard;
-$user = \Joomla\CMS\Factory::getUser();
-?>
-
-<div class="mokowaas-portal">
-	<h2 class="mb-4">Welcome, <?php echo $this->escape($user->name); ?></h2>
-
-	<?php if (!$this->contactId) : ?>
-	<div class="alert alert-warning">Your account is not linked to an ERP contact. Please contact support.</div>
-	<?php else : ?>
-
-	<div class="row g-3 mb-4">
-		<div class="col-6 col-md-3">
-			<div class="card text-center border-0 shadow-sm">
-				<div class="card-body">
-					<div class="fs-3 fw-bold"><?php echo (int) $dash->open_orders; ?></div>
-					<div class="small text-muted">Open Orders</div>
-				</div>
-				<div class="card-footer bg-transparent border-0">
-					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=orders'); ?>" class="btn btn-sm btn-outline-primary w-100">View</a>
-				</div>
-			</div>
-		</div>
-		<div class="col-6 col-md-3">
-			<div class="card text-center border-0 shadow-sm <?php echo (int) $dash->unpaid_invoices > 0 ? 'border-warning' : ''; ?>">
-				<div class="card-body">
-					<div class="fs-3 fw-bold <?php echo (float) $dash->total_due > 0 ? 'text-warning' : ''; ?>"><?php echo (int) $dash->unpaid_invoices; ?></div>
-					<div class="small text-muted">Unpaid Invoices</div>
-					<?php if ((float) $dash->total_due > 0) : ?><div class="small fw-bold text-warning">$<?php echo number_format($dash->total_due, 2); ?> due</div><?php endif; ?>
-				</div>
-				<div class="card-footer bg-transparent border-0">
-					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoices'); ?>" class="btn btn-sm btn-outline-warning w-100">View</a>
-				</div>
-			</div>
-		</div>
-		<div class="col-6 col-md-3">
-			<div class="card text-center border-0 shadow-sm">
-				<div class="card-body">
-					<div class="fs-3 fw-bold"><?php echo (int) $dash->open_tickets; ?></div>
-					<div class="small text-muted">Open Tickets</div>
-				</div>
-				<div class="card-footer bg-transparent border-0">
-					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=tickets'); ?>" class="btn btn-sm btn-outline-primary w-100">View</a>
-				</div>
-			</div>
-		</div>
-		<div class="col-6 col-md-3">
-			<div class="card text-center border-0 shadow-sm <?php echo (int) $dash->pending_signatures > 0 ? 'border-info' : ''; ?>">
-				<div class="card-body">
-					<div class="fs-3 fw-bold"><?php echo (int) $dash->pending_signatures; ?></div>
-					<div class="small text-muted">Pending Signatures</div>
-				</div>
-				<div class="card-footer bg-transparent border-0">
-					<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=sign'); ?>" class="btn btn-sm btn-outline-info w-100">Sign</a>
-				</div>
-			</div>
-		</div>
-	</div>
-
-	<!-- Recent Orders -->
-	<?php if (!empty($dash->recent_orders)) : ?>
-	<div class="card shadow-sm mb-3">
-		<div class="card-header d-flex justify-content-between">
-			<h5 class="mb-0">Recent Orders</h5>
-			<a href="<?php echo Route::_('index.php?option=com_mokowaas&view=orders'); ?>" class="btn btn-sm btn-outline-primary">View All</a>
-		</div>
-		<div class="card-body p-0">
-			<table class="table table-hover mb-0">
-				<thead class="table-light"><tr><th>Ref</th><th>Status</th><th class="text-end">Total</th><th>Date</th></tr></thead>
-				<tbody>
-					<?php foreach ($dash->recent_orders as $order) : ?>
-					<tr>
-						<td><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=order&id=' . (int) $order->id); ?>" class="font-monospace"><?php echo $this->escape($order->ref); ?></a></td>
-						<td><span class="badge bg-primary"><?php echo ucfirst($order->status); ?></span></td>
-						<td class="text-end fw-bold">$<?php echo number_format((float) $order->total, 2); ?></td>
-						<td class="small text-muted"><?php echo $this->escape($order->created); ?></td>
-					</tr>
-					<?php endforeach; ?>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	<?php endif; ?>
-
-	<!-- Quick Links -->
-	<div class="row g-3">
-		<div class="col-md-4"><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=license'); ?>" class="btn btn-outline-secondary w-100"><span class="icon-key"></span> License & Subscription</a></div>
-		<div class="col-md-4"><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=tickets&layout=submit'); ?>" class="btn btn-outline-secondary w-100"><span class="icon-life-ring"></span> Submit Ticket</a></div>
-		<div class="col-md-4"><a href="<?php echo Route::_('index.php?option=com_mokowaas&view=invoices'); ?>" class="btn btn-outline-secondary w-100"><span class="icon-file-invoice"></span> My Invoices</a></div>
-	</div>
-	<?php endif; ?>
-</div>

source/packages/com_mokowaas/site/tmpl/sign/default.php

@@ -1,75 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-
-$signer = $this->signer;
-$request = $this->request;
-$token = \Joomla\CMS\Factory::getApplication()->getInput()->get('token', '', 'ALNUM');
-?>
-
-<div class="mokowaas-sign-page">
-	<?php if (!$signer) : ?>
-	<div class="alert alert-danger">Invalid or expired signing link.</div>
-	<?php elseif ($signer->status === 'signed') : ?>
-	<div class="alert alert-success"><strong>Already signed.</strong> You have already signed this document on <?php echo $this->escape($signer->date_signed); ?>.</div>
-	<?php elseif (!\in_array($request->status, ['pending', 'inprogress'])) : ?>
-	<div class="alert alert-warning">This signing request is no longer active (status: <?php echo $this->escape($request->status); ?>).</div>
-	<?php else : ?>
-
-	<div class="card shadow-sm mb-4">
-		<div class="card-header"><h3 class="mb-0"><?php echo $this->escape($request->title); ?></h3></div>
-		<div class="card-body">
-			<?php if ($request->description) : ?>
-			<div class="border rounded p-3 mb-3 bg-light" style="max-height:400px;overflow-y:auto;">
-				<?php echo nl2br($this->escape($request->description)); ?>
-			</div>
-			<?php endif; ?>
-
-			<form id="signing-form" data-token="<?php echo $this->escape($token); ?>">
-				<!-- Consent -->
-				<?php if ($signer->require_consent && !$signer->consent_accepted) : ?>
-				<div class="alert alert-info">
-					<div class="form-check">
-						<input type="checkbox" id="consent-checkbox" class="form-check-input" required>
-						<label for="consent-checkbox" class="form-check-label">
-							I agree to use electronic signatures and understand this is legally binding.
-						</label>
-					</div>
-				</div>
-				<?php endif; ?>
-
-				<!-- Signature Pad -->
-				<div class="mb-3">
-					<label class="form-label fw-bold">Your Signature</label>
-					<div class="border rounded p-2 bg-white">
-						<canvas id="signature-canvas" width="600" height="200" style="width:100%;height:200px;cursor:crosshair;touch-action:none;"></canvas>
-					</div>
-					<button type="button" id="clear-signature" class="btn btn-sm btn-outline-secondary mt-1">Clear</button>
-				</div>
-
-				<!-- Optional Selfie -->
-				<?php if ($signer->require_selfie) : ?>
-				<div class="mb-3">
-					<label class="form-label fw-bold">Selfie Verification</label>
-					<div><button type="button" id="btn-selfie" class="btn btn-outline-info btn-sm"><span class="icon-camera"></span> Take Selfie</button></div>
-					<canvas id="selfie-preview" class="mt-2 d-none border rounded" width="320" height="240"></canvas>
-				</div>
-				<?php endif; ?>
-
-				<!-- Optional ID Photo -->
-				<?php if ($signer->require_id) : ?>
-				<div class="mb-3">
-					<label class="form-label fw-bold">ID Verification</label>
-					<div><button type="button" id="btn-id-photo" class="btn btn-outline-info btn-sm"><span class="icon-id-card"></span> Take ID Photo</button></div>
-					<canvas id="id-preview" class="mt-2 d-none border rounded" width="320" height="240"></canvas>
-				</div>
-				<?php endif; ?>
-
-				<div class="d-flex gap-2 mt-4">
-					<button type="submit" id="btn-sign" class="btn btn-success btn-lg flex-grow-1"><span class="icon-pen-nib"></span> Sign Document</button>
-					<button type="button" id="btn-decline" class="btn btn-outline-danger">Decline</button>
-				</div>
-			</form>
-		</div>
-	</div>
-	<?php endif; ?>
-</div>

source/packages/com_mokowaas/site/tmpl/signverify/default.php

@@ -1,64 +0,0 @@
-<?php
-defined('_JEXEC') or die;
-$req = $this->request;
-?>
-<div class="mokowaas-verify-page">
-	<?php if (!$req) : ?>
-	<div class="alert alert-danger">Verification not found. Check the verification link.</div>
-	<?php else : ?>
-	<div class="card shadow-sm mb-3">
-		<div class="card-header text-center">
-			<h3 class="mb-0">Certificate of Verification</h3>
-			<div class="small text-muted">Electronic Signature Verification</div>
-		</div>
-		<div class="card-body">
-			<div class="text-center mb-4">
-				<?php if ($req->status === 'completed') : ?>
-				<div class="alert alert-success fs-5"><span class="icon-check-circle"></span> This document has been fully signed and is legally valid.</div>
-				<?php else : ?>
-				<div class="alert alert-warning">Status: <?php echo ucfirst($req->status); ?> — this document has not been fully signed.</div>
-				<?php endif; ?>
-			</div>
-			<div class="row g-3 mb-4">
-				<div class="col-md-4"><div class="text-muted small">Reference</div><div class="font-monospace fw-bold"><?php echo $this->escape($req->ref); ?></div></div>
-				<div class="col-md-4"><div class="text-muted small">Title</div><div><?php echo $this->escape($req->title); ?></div></div>
-				<div class="col-md-4"><div class="text-muted small">Completed</div><div><?php echo $this->escape($req->date_signature ?? 'Pending'); ?></div></div>
-			</div>
-
-			<h5>Signers</h5>
-			<table class="table table-sm">
-				<thead class="table-light"><tr><th>Name</th><th>Email</th><th>Status</th><th>Signed</th><th>Location</th></tr></thead>
-				<tbody>
-					<?php foreach ($req->signers as $s) :
-						$name = trim(($s->firstname ?? '') . ' ' . ($s->lastname ?? '')) ?: '—';
-						$loc = implode(', ', array_filter([$s->geo_city ?? '', $s->geo_country ?? ''])) ?: '—';
-					?>
-					<tr>
-						<td><?php echo $this->escape($name); ?></td>
-						<td class="small"><?php echo $this->escape($s->email); ?></td>
-						<td><span class="badge bg-<?php echo $s->status === 'signed' ? 'success' : ($s->status === 'declined' ? 'danger' : 'warning'); ?>"><?php echo ucfirst($s->status); ?></span></td>
-						<td class="small"><?php echo $this->escape($s->date_signed ?? '—'); ?></td>
-						<td class="small"><?php echo $this->escape($loc); ?></td>
-					</tr>
-					<?php endforeach; ?>
-				</tbody>
-			</table>
-
-			<h5 class="mt-4">Audit Trail</h5>
-			<table class="table table-sm">
-				<thead class="table-light"><tr><th>Time</th><th>Event</th><th>Description</th><th>IP</th></tr></thead>
-				<tbody>
-					<?php foreach ($req->events as $ev) : ?>
-					<tr>
-						<td class="small text-muted"><?php echo $this->escape($ev->created); ?></td>
-						<td><span class="badge bg-info"><?php echo $this->escape($ev->code); ?></span></td>
-						<td class="small"><?php echo $this->escape($ev->label); ?></td>
-						<td class="font-monospace small"><?php echo $this->escape($ev->ip ?? '—'); ?></td>
-					</tr>
-					<?php endforeach; ?>
-				</tbody>
-			</table>
-		</div>
-	</div>
-	<?php endif; ?>
-</div>

source/packages/mod_mokowaas_cache/mod_mokowaas_cache.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+	<version>02.34.15</version>
 	<description>MOD_MOKOWAAS_CACHE_DESC</description>
 	<namespace path="src">Moko\Module\MokoWaaSCache</namespace>
 

source/packages/mod_mokowaas_categories/mod_mokowaas_categories.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+	<version>02.34.15</version>
 	<description>MOD_MOKOWAAS_CATEGORIES_DESC</description>
 	<namespace path="src">Moko\Module\MokoWaaSCategories</namespace>
 

source/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml

@@ -7,7 +7,11 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/mod_mokowaas_cpanel/mod_mokowaas_cpanel.xml
 	<description>MOD_MOKOWAAS_CPANEL_DESC</description>
 	<namespace path="src">Moko\Module\MokoWaaSCpanel</namespace>
 

source/packages/mod_mokowaas_menu/mod_mokowaas_menu.xml

@@ -7,7 +7,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+	<version>02.34.15</version>
 	<description>MokoWaaS admin sidebar menu — renders a dedicated MokoWaaS section in the admin menu before Joomla's default menu.</description>
 	<namespace path="src">Moko\Module\MokoWaaSMenu</namespace>
 

source/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.29
+ * VERSION: 02.34.16
  * PATH: /src/Extension/MokoWaaS.php
  * NOTE: Core system plugin for MokoWaaS admin tools suite
  */
@@ -172,6 +172,7 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 		{
 			$this->handleOneTimeLogin();
 			$this->checkSetupRequired();
+			$this->preserveDownloadKeys();
 		}
 	}
 
@@ -2236,4 +2237,91 @@ class MokoWaaS extends CMSPlugin implements BootableExtensionInterface
 	 *
 	 * @since   02.34.12
 	 */
+	protected function preserveDownloadKeys(): void
+	{
+		try
+		{
+			$db = Factory::getDbo();
+
+			// Load current extra_query values for all update sites
+			$query = $db->getQuery(true)
+				->select([
+					$db->quoteName('update_site_id'),
+					$db->quoteName('extra_query'),
+					$db->quoteName('location'),
+				])
+				->from($db->quoteName('#__update_sites'));
+			$db->setQuery($query);
+			$sites = $db->loadObjectList('update_site_id') ?: [];
+
+			$backupFile = JPATH_ADMINISTRATOR . '/cache/mokowaas_dlkeys.json';
+			$backup     = [];
+
+			if (file_exists($backupFile))
+			{
+				$backup = json_decode(file_get_contents($backupFile), true) ?: [];
+			}
+
+			$restored = 0;
+			$updated  = false;
+
+			foreach ($sites as $id => $site)
+			{
+				$currentKey = trim((string) $site->extra_query);
+				$backupKey  = $backup[$id] ?? '';
+
+				if ($currentKey !== '')
+				{
+					// Site has a key — update backup if changed
+					if ($currentKey !== $backupKey)
+					{
+						$backup[$id] = $currentKey;
+						$updated     = true;
+					}
+				}
+				elseif ($backupKey !== '')
+				{
+					// Key was wiped — restore from backup
+					$db->setQuery(
+						$db->getQuery(true)
+							->update($db->quoteName('#__update_sites'))
+							->set($db->quoteName('extra_query') . ' = ' . $db->quote($backupKey))
+							->where($db->quoteName('update_site_id') . ' = ' . (int) $id)
+					)->execute();
+
+					$restored++;
+				}
+			}
+
+			// Clean up backup entries for update sites that no longer exist
+			$currentIds = array_keys($sites);
+
+			foreach (array_keys($backup) as $backupId)
+			{
+				if (!isset($sites[$backupId]))
+				{
+					unset($backup[$backupId]);
+					$updated = true;
+				}
+			}
+
+			if ($updated || $restored > 0)
+			{
+				file_put_contents($backupFile, json_encode($backup, JSON_PRETTY_PRINT));
+			}
+
+			if ($restored > 0)
+			{
+				Log::add(
+					sprintf('MokoWaaS: restored %d download key(s) that were cleared by Joomla.', $restored),
+					Log::INFO,
+					'mokowaas'
+				);
+			}
+		}
+		catch (\Throwable $e)
+		{
+			// Non-critical — don't break the site over key backup
+		}
+	}
 }

source/packages/plg_system_mokowaas/Field/CopyableTokenField.php

@@ -8,7 +8,11 @@
  * FILE INFORMATION
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
- * VERSION: 02.34.29
+<<<<<<< HEAD:src/packages/plg_system_mokowaas/Field/CopyableTokenField.php
+ * VERSION: 02.34.00
+=======
+ * VERSION: 02.34.16
+>>>>>>> origin/dev:source/packages/plg_system_mokowaas/Field/CopyableTokenField.php
  * PATH: /src/Field/CopyableTokenField.php
  * BRIEF: Read-only token field with a copy-to-clipboard button
  */
@@ -18,7 +22,6 @@ namespace Moko\Plugin\System\MokoWaaS\Field;
 defined('_JEXEC') or die;
 
 use Joomla\CMS\Form\FormField;
-use Joomla\CMS\Session\Session;
 
 /**
  * Renders a read-only text input with a "Copy" button, similar to
@@ -40,9 +43,8 @@ class CopyableTokenField extends FormField
 			return '<div class="alert alert-warning mb-0 py-2">Token will be generated automatically on first save.</div>';
 		}
 
-		$pin   = strtoupper(substr($this->value, 0, 4) . '-' . substr($this->value, 4, 4));
+		// Derive a human-readable support PIN from the token
-		$token = Session::getFormToken();
+		$pin = strtoupper(substr($this->value, 0, 4) . '-' . substr($this->value, 4, 4));
-		$ajaxUrl = 'index.php?option=com_mokowaas&task=display.sendHeartbeat&format=json';
 
 		return <<<HTML
 <div class="input-group mb-2">
@@ -62,31 +64,6 @@ class CopyableTokenField extends FormField
 			inp.select(); document.execCommand('copy');
 		}
 	"><span class="icon-copy" aria-hidden="true"></span> Copy</button>
-	<button type="button" class="btn btn-outline-primary" id="mokowaas-send-heartbeat" onclick="
-		var btn = this;
-		btn.disabled = true;
-		var orig = btn.innerHTML;
-		btn.innerHTML = '<span class=&quot;icon-spinner icon-spin&quot; aria-hidden=&quot;true&quot;></span> Sending...';
-		var fd = new FormData();
-		fd.append('{$token}', '1');
-		fetch('{$ajaxUrl}', {method:'POST', body:fd, headers:{'X-Requested-With':'XMLHttpRequest'}})
-			.then(function(r){return r.json()})
-			.then(function(d){
-				if(d.success){
-					btn.innerHTML='<span class=&quot;icon-check&quot; aria-hidden=&quot;true&quot;></span> Sent';
-					btn.classList.replace('btn-outline-primary','btn-success');
-				} else {
-					btn.innerHTML='<span class=&quot;icon-times&quot; aria-hidden=&quot;true&quot;></span> Failed';
-					btn.classList.replace('btn-outline-primary','btn-danger');
-				}
-				setTimeout(function(){btn.innerHTML=orig;btn.className='btn btn-outline-primary';btn.disabled=false;},3000);
-			})
-			.catch(function(){
-				btn.innerHTML='<span class=&quot;icon-times&quot; aria-hidden=&quot;true&quot;></span> Error';
-				btn.classList.replace('btn-outline-primary','btn-danger');
-				setTimeout(function(){btn.innerHTML=orig;btn.className='btn btn-outline-primary';btn.disabled=false;},3000);
-			});
-	"><span class="icon-heart" aria-hidden="true"></span> Send Heartbeat</button>
 </div>
 <div class="d-flex align-items-center gap-2">
 	<span class="badge bg-dark" style="font-family:monospace;font-size:1rem;letter-spacing:0.1em;">MOKO-{$pin}</span>

source/packages/plg_system_mokowaas/mokowaas.xml

@@ -30,7 +30,7 @@
 	<license>GNU General Public License version 3 or later; see LICENSE.md</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+	<version>02.34.15</version>
 	<description>MokoWaaS core system plugin — coordinates feature plugins, heartbeat, health checks, and admin customizations.</description>
 	<namespace path=".">Moko\Plugin\System\MokoWaaS</namespace>
 	<scriptfile>script.php</scriptfile>

source/packages/plg_system_mokowaas/script.php

@@ -22,7 +22,11 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
  * REPO: https://github.com/mokoconsulting-tech/mokowaas
- * VERSION: 02.34.29
+<<<<<<< HEAD:src/packages/plg_system_mokowaas/script.php
+ * VERSION: 02.34.00
+=======
+ * VERSION: 02.34.16
+>>>>>>> origin/dev:source/packages/plg_system_mokowaas/script.php
  * PATH: /src/script.php
  * BRIEF: Installation script for MokoWaaS plugin
  * NOTE: Handles installation, update, and uninstallation tasks including language override deployment

source/packages/plg_system_mokowaas/services/provider.php

@@ -22,7 +22,11 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
  * REPO: https://github.com/mokoconsulting-tech/mokowaas
- * VERSION: 02.34.29
+<<<<<<< HEAD:src/packages/plg_system_mokowaas/services/provider.php
+ * VERSION: 02.34.00
+=======
+ * VERSION: 02.34.16
+>>>>>>> origin/dev:source/packages/plg_system_mokowaas/services/provider.php
  * PATH: /src/services/provider.php
  * BRIEF: Service provider for dependency injection in Joomla 5.x
  * NOTE: Registers the plugin with Joomla's DI container

source/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml

@@ -8,7 +8,11 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_system_mokowaas_devtools/mokowaas_devtools.xml
 	<description>PLG_SYSTEM_MOKOWAAS_DEVTOOLS_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSDevTools</namespace>
 

source/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml

@@ -8,7 +8,11 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_system_mokowaas_firewall/mokowaas_firewall.xml
 	<description>PLG_SYSTEM_MOKOWAAS_FIREWALL_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSFirewall</namespace>
 

source/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml

@@ -8,7 +8,11 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_system_mokowaas_monitor/mokowaas_monitor.xml
 	<description>PLG_SYSTEM_MOKOWAAS_MONITOR_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSMonitor</namespace>
 

source/packages/plg_system_mokowaas_offline/mokowaas_offline.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+	<version>02.34.15</version>
 	<description>PLG_SYSTEM_MOKOWAAS_OFFLINE_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSOffline</namespace>
 

source/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml

@@ -8,7 +8,11 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_system_mokowaas_tenant/mokowaas_tenant.xml
 	<description>PLG_SYSTEM_MOKOWAAS_TENANT_DESC</description>
 	<namespace path="src">Moko\Plugin\System\MokoWaaSTenant</namespace>
 

source/packages/plg_task_mokowaas_tickets/mokowaas_tickets.xml

@@ -8,7 +8,7 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+	<version>02.34.15</version>
 	<description>Runs scheduled helpdesk automation rules — auto-close resolved tickets, SLA breach escalation, and time-based actions.</description>
 	<namespace path="src">Moko\Plugin\Task\MokoWaaSTickets</namespace>
 

source/packages/plg_task_mokowaasdemo/mokowaasdemo.xml

@@ -12,7 +12,12 @@
 	<license>GNU General Public License version 3 or later; see LICENSE</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_task_mokowaasdemo/mokowaasdemo.xml
+	<version>02.34.00</version>
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_task_mokowaasdemo/mokowaasdemo.xml
 	<description>PLG_TASK_MOKOWAASDEMO_DESC</description>
 	<namespace path="src">Moko\Plugin\Task\MokoWaaSDemo</namespace>
 

source/packages/plg_task_mokowaasdemo/src/Service/DemoResetService.php

@@ -10,7 +10,11 @@
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
  * PATH: /src/packages/plg_system_mokowaas/Service/DemoResetService.php
- * VERSION: 02.34.29
+<<<<<<< HEAD:src/packages/plg_system_mokowaas/Service/DemoResetService.php
+ * VERSION: 02.34.00
+=======
+ * VERSION: 02.34.08
+>>>>>>> origin/dev:source/packages/plg_task_mokowaasdemo/src/Service/DemoResetService.php
  * BRIEF: Content-only snapshot/restore for demo site reset
  */
 

source/packages/plg_task_mokowaassync/mokowaassync.xml

@@ -12,7 +12,11 @@
 	<license>GNU General Public License version 3 or later; see LICENSE</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_task_mokowaassync/mokowaassync.xml
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_task_mokowaassync/mokowaassync.xml
 	<description>PLG_TASK_MOKOWAASSYNC_DESC</description>
 	<namespace path="src">Moko\Plugin\Task\MokoWaaSSync</namespace>
 

source/packages/plg_task_mokowaassync/src/Service/ContentSyncReceiver.php

@@ -10,7 +10,11 @@
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
  * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php
- * VERSION: 02.34.29
+<<<<<<< HEAD:src/packages/plg_system_mokowaas/Service/ContentSyncReceiver.php
+ * VERSION: 02.34.00
+=======
+ * VERSION: 02.34.08
+>>>>>>> origin/dev:source/packages/plg_task_mokowaassync/src/Service/ContentSyncReceiver.php
  * BRIEF: Receiver-side content sync — applies incoming payload to local DB
  */
 

source/packages/plg_task_mokowaassync/src/Service/ContentSyncService.php

@@ -10,7 +10,11 @@
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
  * PATH: /src/packages/plg_system_mokowaas/Service/ContentSyncService.php
- * VERSION: 02.34.29
+<<<<<<< HEAD:src/packages/plg_system_mokowaas/Service/ContentSyncService.php
+ * VERSION: 02.34.00
+=======
+ * VERSION: 02.34.08
+>>>>>>> origin/dev:source/packages/plg_task_mokowaassync/src/Service/ContentSyncService.php
  * BRIEF: Sender-side content sync — builds payload and pushes to remote sites
  */
 

source/packages/plg_webservices_mokowaas/mokowaas.xml

@@ -7,7 +7,12 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_webservices_mokowaas/mokowaas.xml
+	<version>02.34.00</version>
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_webservices_mokowaas/mokowaas.xml
 	<description>Joomla Web Services API routes for MokoWaaS site management — health checks, cache, updates, backups, and site info.</description>
 	<namespace path="src">Moko\Plugin\WebServices\MokoWaaS</namespace>
 	<files>

source/packages/plg_webservices_perfectpublisher/perfectpublisher.xml

@@ -7,7 +7,12 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/packages/plg_webservices_perfectpublisher/perfectpublisher.xml
+	<version>02.34.00</version>
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/packages/plg_webservices_perfectpublisher/perfectpublisher.xml
 	<description>Joomla Web Services API routes for Perfect Publisher (com_autotweet) — channels, posts, requests, rules, and feeds.</description>
 	<namespace path="src">Moko\Plugin\WebServices\PerfectPublisher</namespace>
 	<files>

source/packages/plg_webservices_perfectpublisher/services/provider.php

@@ -7,8 +7,13 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
+<<<<<<< HEAD:src/packages/plg_webservices_perfectpublisher/services/provider.php
+ * PATH: /src/packages/plg_webservices_perfectpublisher/services/provider.php
+ * VERSION: 02.34.00
+=======
  * PATH: /source/packages/plg_webservices_perfectpublisher/services/provider.php
- * VERSION: 02.34.29
+ * VERSION: 02.34.16
+>>>>>>> origin/dev:source/packages/plg_webservices_perfectpublisher/services/provider.php
  * BRIEF: DI service provider for Perfect Publisher Web Services plugin
  */
 

source/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php

@@ -7,8 +7,13 @@
  * DEFGROUP: Joomla.Plugin
  * INGROUP: MokoWaaS
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
+<<<<<<< HEAD:src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php
+ * PATH: /src/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php
+ * VERSION: 02.34.00
+=======
  * PATH: /source/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php
- * VERSION: 02.34.29
+ * VERSION: 02.34.16
+>>>>>>> origin/dev:source/packages/plg_webservices_perfectpublisher/src/Extension/PerfectPublisherApi.php
  * BRIEF: Web Services API plugin for Perfect Publisher (com_autotweet)
  */
 

source/pkg_mokowaas.xml

@@ -2,7 +2,11 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoWaaS</name>
 	<packagename>mokowaas</packagename>
-	<version>02.34.29-dev</version>
+<<<<<<< HEAD:src/pkg_mokowaas.xml
+	<version>02.34.00</version>
+=======
+	<version>02.34.15</version>
+>>>>>>> origin/dev:source/pkg_mokowaas.xml
 	<creationDate>2026-06-02</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -35,4 +39,6 @@
 	<updateservers>
 		<server type="extension" priority="1" name="Package - MokoWaaS">https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/updates.xml</server>
 	</updateservers>
+	<dlid prefix="dlid=" suffix=""/>
+	<blockChildUninstall>true</blockChildUninstall>
 </extension>

source/script.php

@@ -39,13 +39,8 @@ class Pkg_MokowaasInstallerScript
 	 * with no default, causing INSERT failures when Joomla's package installer
 	 * creates placeholder rows before processing sub-extension manifests.
 	 */
-	/** @var string|null Download key saved before Joomla wipes update sites */
-	private ?string $savedDownloadKey = null;
-
 	public function preflight($type, $parent)
 	{
-		$this->saveDownloadKey();
-
 		try
 		{
 			$db = Factory::getDbo();
@@ -106,9 +101,6 @@ class Pkg_MokowaasInstallerScript
 		// Clean up stale/duplicate update sites
 		$this->cleanupStaleUpdateSites();
 
-		// Restore download key saved in preflight
-		$this->restoreDownloadKey();
-
 		// Fix orphaned update records (extension_id=0)
 		$this->fixUpdateRecords();
 
@@ -594,7 +586,7 @@ class Pkg_MokowaasInstallerScript
 		try
 		{
 			$db = Factory::getDbo();
-			$dynamicUrl = 'https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/updates.xml';
+			$dynamicUrl = 'https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS/raw/branch/main/updates.xml';
 
 			// Find all MokoWaaS update sites
 			$query = $db->getQuery(true)
@@ -664,69 +656,6 @@ class Pkg_MokowaasInstallerScript
 		}
 	}
 
-	/**
-	 * Backup all non-empty extra_query values from update sites.
-	 *
-	 * @return  array  Map of update_site_id => extra_query
-	 */
-	private function saveDownloadKey(): void
-	{
-		try
-		{
-			$db = Factory::getDbo();
-			$db->setQuery(
-				$db->getQuery(true)
-					->select($db->quoteName('us.extra_query'))
-					->from($db->quoteName('#__update_sites', 'us'))
-					->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
-					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
-					->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokowaas'))
-					->setLimit(1)
-			);
-			$key = $db->loadResult();
-
-			if (!empty($key))
-			{
-				$this->savedDownloadKey = $key;
-			}
-		}
-		catch (\Throwable $e) {}
-	}
-
-	private function restoreDownloadKey(): void
-	{
-		if ($this->savedDownloadKey === null)
-		{
-			return;
-		}
-
-		try
-		{
-			$db = Factory::getDbo();
-			$db->setQuery(
-				$db->getQuery(true)
-					->select($db->quoteName('us.update_site_id'))
-					->from($db->quoteName('#__update_sites', 'us'))
-					->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
-					->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
-					->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokowaas'))
-					->setLimit(1)
-			);
-			$siteId = (int) $db->loadResult();
-
-			if ($siteId > 0)
-			{
-				$db->setQuery(
-					$db->getQuery(true)
-						->update($db->quoteName('#__update_sites'))
-						->set($db->quoteName('extra_query') . ' = ' . $db->quote($this->savedDownloadKey))
-						->where($db->quoteName('update_site_id') . ' = ' . $siteId)
-				)->execute();
-			}
-		}
-		catch (\Throwable $e) {}
-	}
-
 	/**
 	 * Ensure the MokoWaaS update server entry stays enabled and points
 	 * to the correct dynamic endpoint with the license key attached.

src/packages/com_mokowaas/mokowaas.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+
+ SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later
+
+ FILE INFORMATION
+ DEFGROUP: Joomla.Component
+ INGROUP: MokoWaaS
+ REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoWaaS
+ VERSION: 02.32.04
+ PATH: /mokowaas.xml
+ BRIEF: Component manifest for MokoWaaS admin dashboard and REST API
+-->
+<extension type="component" method="upgrade">
+	<name>MokoWaaS</name>
+	<author>Moko Consulting</author>
+	<creationDate>2026-06-02</creationDate>
+	<copyright>Copyright (C) 2026 Moko Consulting. All rights reserved.</copyright>
+	<license>GPL-3.0-or-later</license>
+	<authorEmail>hello@mokoconsulting.tech</authorEmail>
+	<authorUrl>https://mokoconsulting.tech</authorUrl>
+	<version>02.34.00</version>
+	<description>MokoWaaS admin dashboard and REST API. Provides a control panel for managing MokoWaaS feature plugins, site health monitoring, and remote management endpoints.</description>
+
+	<namespace path="src">Moko\Component\MokoWaaS</namespace>
+
+	<administration>
+		<menu img="class:cogs">MokoWaaS</menu>
+		<files folder="admin">
+			<folder>language</folder>
+			<folder>services</folder>
+			<folder>src</folder>
+			<folder>tmpl</folder>
+		</files>
+	</administration>
+
+	<api>
+		<files folder="api">
+			<folder>src</folder>
+		</files>
+	</api>
+
+	<media destination="com_mokowaas" folder="media">
+		<folder>css</folder>
+		<folder>js</folder>
+	</media>
+</extension>

src/packages/plg_system_mokowaas/Field/AllowedIpsField.php

@@ -0,0 +1,72 @@
+<?php
+/**
+ * Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later
+ *
+ * FILE INFORMATION
+ * DEFGROUP: Joomla.Plugin
+ * INGROUP: MokoWaaS
+ * VERSION: 02.34.00
+ * 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  = '<span class="badge bg-danger">Not configured</span>';
+			$ipList  = '<em>No IPs set — emergency access is blocked.</em>';
+		}
+		else
+		{
+			$ips     = array_map('trim', explode(',', $allowedRaw));
+			$status  = '<span class="badge bg-success">'
+				. count($ips) . ' IP(s) configured</span>';
+			$ipItems = [];
+
+			foreach ($ips as $ip)
+			{
+				$match = ($ip === $currentIp)
+					? ' <span class="badge bg-info">your IP</span>'
+					: '';
+				$ipItems[] = '<code>' . htmlspecialchars($ip)
+					. '</code>' . $match;
+			}
+
+			$ipList = implode(', ', $ipItems);
+		}
+
+		$yourIp = '<code>' . htmlspecialchars($currentIp) . '</code>';
+
+		return '<div class="alert alert-info mb-0">'
+			. '<strong>IP Whitelist:</strong> ' . $status . '<br>'
+			. '<strong>Allowed IPs:</strong> ' . $ipList . '<br>'
+			. '<strong>Your current IP:</strong> ' . $yourIp . '<br>'
+			. '<small class="text-muted">Set <code>public '
+			. '$mokowaas_allowed_ips = \'1.2.3.4,5.6.7.8\';</code>'
+			. ' in configuration.php to change.</small>'
+			. '</div>';
+	}
+
+	protected function getLabel()
+	{
+		return '';
+	}
+}

src/packages/plg_system_mokowaas/Field/CurrentIpField.php

@@ -0,0 +1,40 @@
+<?php
+/**
+ * Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+ *
+ * SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later
+ *
+ * FILE INFORMATION
+ * DEFGROUP: Joomla.Plugin
+ * INGROUP: MokoWaaS
+ * VERSION: 02.34.00
+ * 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 '<div class="alert alert-info mb-0 py-2">'
+			. '<strong>Your current IP:</strong> '
+			. '<code>' . htmlspecialchars($currentIp) . '</code> '
+			. '<small class="text-muted">&mdash; add this to the table below to keep your session alive.</small>'
+			. '</div>';
+	}
+
+	protected function getLabel()
+	{
+		return '';
+	}
+}

src/packages/plg_system_mokowaas/Field/DemoTaskInfoField.php

@@ -0,0 +1,237 @@
+<?php
+/**
+ * @package     MokoWaaS
+ * @subpackage  plg_system_mokowaas
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ *
+ * FILE INFORMATION
+ * DEFGROUP: Joomla.Plugin
+ * INGROUP: MokoWaaS
+ * VERSION: 02.34.00
+ * PATH: /src/Field/DemoTaskInfoField.php
+ * BRIEF: Read-only field showing scheduled task info with link to manage it
+ */
+
+namespace Moko\Plugin\System\MokoWaaS\Field;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormField;
+use Joomla\CMS\Router\Route;
+
+/**
+ * Displays the demo reset scheduled task status: schedule, next run,
+ * last run, and a direct link to edit the task in Joomla's Scheduler.
+ *
+ * @since  02.29.00
+ */
+class DemoTaskInfoField extends FormField
+{
+	protected $type = 'DemoTaskInfo';
+
+	protected function getInput()
+	{
+		// Query the scheduled task — if it exists and is enabled, demo mode is on
+		try
+		{
+			$db    = Factory::getDbo();
+			$query = $db->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 '<div class="alert alert-info mb-0 py-2">'
+				. 'No demo reset task configured. '
+				. '<a href="' . $newTaskLink . '" class="alert-link">Create a Scheduled Task</a> '
+				. 'and select <strong>MokoWaaS Demo Reset</strong> to enable demo mode.</div>';
+		}
+
+		$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 = '<span class="badge bg-warning text-dark">DUE</span>';
+			}
+			elseif ($diff < 3600)
+			{
+				$nextBadge = '<span class="badge bg-info">in ' . (int) ceil($diff / 60) . ' min</span>';
+			}
+			elseif ($diff < 86400)
+			{
+				$nextBadge = '<span class="badge bg-info">in ' . round($diff / 3600, 1) . 'h</span>';
+			}
+			else
+			{
+				$nextBadge = '<span class="badge bg-secondary">in ' . round($diff / 86400, 1) . 'd</span>';
+			}
+		}
+
+		// 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
+			? '<span class="badge bg-success">Enabled</span>'
+			: '<span class="badge bg-danger">Disabled</span>';
+
+		// 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 '<div class="card card-body bg-light py-2 px-3 mb-0">'
+			. '<table class="table table-sm table-borderless mb-1" style="max-width:550px">'
+			. '<tr><td class="text-muted" style="width:130px">Status</td><td>' . $stateBadge . '</td></tr>'
+			. '<tr><td class="text-muted">Schedule</td><td>' . htmlspecialchars($friendlySchedule) . '</td></tr>'
+			. '<tr><td class="text-muted">Next Reset</td><td>' . htmlspecialchars($nextFormatted) . ' ' . $nextBadge . '</td></tr>'
+			. '<tr><td class="text-muted">Last Reset</td><td>' . htmlspecialchars($lastFormatted) . '</td></tr>'
+			. '<tr><td class="text-muted">Runs</td><td>' . (int) ($task['times_executed'] ?? 0) . ' executed, ' . (int) ($task['times_failed'] ?? 0) . ' failed</td></tr>'
+			. '<tr><td class="text-muted">Baseline</td><td>' . ($snapshotExists ? '<span class="badge bg-success">Saved</span>' : '<span class="badge bg-warning text-dark">Not taken yet</span>') . '</td></tr>'
+			. '<tr><td class="text-muted">Banner</td><td>' . ($bannerOn ? 'On' : 'Off') . ($countdownOn ? ' + countdown' : '') . '</td></tr>'
+			. '<tr><td class="text-muted">Images</td><td>' . ($mediaOn ? 'Included' : 'Excluded') . '</td></tr>'
+			. '</table>'
+			. '<a href="' . $editLink . '" class="btn btn-sm btn-outline-primary">'
+			. '<span class="icon-cog" aria-hidden="true"></span> Manage Scheduled Task</a>'
+			. '</div>';
+	}
+
+	protected function getLabel()
+	{
+		return '<label class="form-label"><strong>Scheduled Reset</strong></label>';
+	}
+
+	/**
+	 * 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';
+	}
+}

src/packages/plg_system_mokowaas/Field/NextResetField.php

@@ -0,0 +1,156 @@
+<?php
+/**
+ * @package     MokoWaaS
+ * @subpackage  plg_system_mokowaas
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ *
+ * FILE INFORMATION
+ * DEFGROUP: Joomla.Plugin
+ * INGROUP: MokoWaaS
+ * VERSION: 02.34.00
+ * PATH: /src/Field/NextResetField.php
+ * BRIEF: Read-only field showing next reset time from Joomla scheduled task
+ */
+
+namespace Moko\Plugin\System\MokoWaaS\Field;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormField;
+
+/**
+ * Pulls the next execution time directly from the Joomla scheduled task
+ * (#__scheduler_tasks) and displays it formatted in the site timezone.
+ *
+ * @since  02.29.00
+ */
+class NextResetField extends FormField
+{
+	protected $type = 'NextReset';
+
+	protected function getInput()
+	{
+		// Check if demo mode is enabled
+		$demoEnabled = false;
+
+		if ($this->form)
+		{
+			$demoEnabled = (int) $this->form->getValue('demo_mode_enabled', 'params', 0) === 1;
+		}
+
+		if (!$demoEnabled)
+		{
+			return '<span class="form-control-plaintext text-muted">Demo mode is off</span>'
+				. '<input type="hidden" name="' . $this->name . '" value="" />';
+		}
+
+		// 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 '<div class="alert alert-secondary mb-0 py-2">No scheduled task found — save to create one automatically.</div>'
+				. '<input type="hidden" name="' . $this->name . '" value="" />';
+		}
+
+		if ((int) $task['state'] !== 1)
+		{
+			return '<div class="alert alert-warning mb-0 py-2">Scheduled task is disabled.</div>'
+				. '<input type="hidden" name="' . $this->name . '" value="" />';
+		}
+
+		$nextExec = $task['next_execution'];
+		$lastExec = $task['last_execution'];
+
+		if (empty($nextExec) || $nextExec === '0000-00-00 00:00:00')
+		{
+			return '<div class="alert alert-secondary mb-0 py-2">Waiting for first run...</div>'
+				. '<input type="hidden" name="' . $this->name . '" value="" />';
+		}
+
+		// 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 = '<span class="badge bg-warning text-dark">overdue</span>';
+		}
+		elseif ($diff < 3600)
+		{
+			$mins = (int) ceil($diff / 60);
+			$relative = '<span class="badge bg-info">in ' . $mins . ' min</span>';
+		}
+		elseif ($diff < 86400)
+		{
+			$hours = round($diff / 3600, 1);
+			$relative = '<span class="badge bg-info">in ' . $hours . 'h</span>';
+		}
+		else
+		{
+			$days = round($diff / 86400, 1);
+			$relative = '<span class="badge bg-secondary">in ' . $days . 'd</span>';
+		}
+
+		// 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 = '<small class="text-muted ms-2">Last run: ' . $lastDt->format('M j, g:i A') . '</small>';
+			}
+			catch (\Throwable $e)
+			{
+				// skip
+			}
+		}
+
+		return '<div class="d-flex align-items-center gap-2 flex-wrap">'
+			. '<span class="form-control-plaintext" style="font-weight:500">'
+			. '<span class="icon-calendar" aria-hidden="true"></span> '
+			. htmlspecialchars($formatted) . '</span> '
+			. $relative
+			. $lastInfo
+			. '<input type="hidden" name="' . $this->name . '" value="' . htmlspecialchars($nextExec) . '" />'
+			. '</div>';
+	}
+}

src/packages/plg_system_mokowaas/Field/SnapshotTablesField.php

@@ -0,0 +1,175 @@
+<?php
+/**
+ * @package     MokoWaaS
+ * @subpackage  plg_system_mokowaas
+ * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
+ * @license     GNU General Public License version 3 or later; see LICENSE
+ *
+ * FILE INFORMATION
+ * DEFGROUP: Joomla.Plugin
+ * INGROUP: MokoWaaS
+ * VERSION: 02.34.00
+ * PATH: /src/Field/SnapshotTablesField.php
+ * BRIEF: Multi-select list field that loads DB tables with sensible defaults
+ */
+
+namespace Moko\Plugin\System\MokoWaaS\Field;
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Factory;
+use Joomla\CMS\Form\FormField;
+
+/**
+ * Renders a multi-select list box of all Joomla database tables, with
+ * content-related tables pre-selected by default.
+ *
+ * @since  02.26.00
+ */
+class SnapshotTablesField extends FormField
+{
+	protected $type = 'SnapshotTables';
+
+	/**
+	 * Tables selected by default when no value is stored yet.
+	 *
+	 * @var    array
+	 * @since  02.25.00
+	 */
+	private const DEFAULT_TABLES = [
+		'#__content',
+		'#__categories',
+		'#__fields',
+		'#__fields_values',
+		'#__fields_groups',
+		'#__menu',
+		'#__menu_types',
+		'#__modules',
+		'#__modules_menu',
+		'#__users',
+		'#__user_usergroup_map',
+		'#__user_profiles',
+		'#__tags',
+		'#__contentitem_tag_map',
+		'#__assets',
+	];
+
+	/**
+	 * Table suffixes grouped by category.
+	 *
+	 * @var    array
+	 * @since  02.25.00
+	 */
+	private const TABLE_GROUPS = [
+		'Content'  => ['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 = '<select name="' . $this->name . '" id="' . $this->id . '"'
+			. ' multiple="multiple" size="' . $size . '"'
+			. ' class="form-select">';
+
+		$priority = ['Content', 'Users', 'Menus', 'Modules', 'Assets'];
+
+		foreach ($priority as $g)
+		{
+			if (!empty($grouped[$g]))
+			{
+				$html .= '<optgroup label="' . $g . '">';
+
+				foreach ($grouped[$g] as $t)
+				{
+					$sel = in_array($t, $selected, true) ? ' selected="selected"' : '';
+					$html .= '<option value="' . htmlspecialchars($t) . '"' . $sel . '>' . htmlspecialchars($t) . '</option>';
+				}
+
+				$html .= '</optgroup>';
+				unset($grouped[$g]);
+			}
+		}
+
+		if (!empty($grouped['Other']))
+		{
+			$html .= '<optgroup label="Other">';
+
+			foreach ($grouped['Other'] as $t)
+			{
+				$sel = in_array($t, $selected, true) ? ' selected="selected"' : '';
+				$html .= '<option value="' . htmlspecialchars($t) . '"' . $sel . '>' . htmlspecialchars($t) . '</option>';
+			}
+
+			$html .= '</optgroup>';
+		}
+
+		$html .= '</select>';
+
+		// "Reset to defaults" link
+		$defaultsJson = htmlspecialchars(json_encode(self::DEFAULT_TABLES), ENT_QUOTES, 'UTF-8');
+		$html .= '<div class="mt-1">'
+			. '<a href="#" class="small" onclick="'
+			. 'var sel=document.getElementById(\'' . $this->id . '\');'
+			. 'var defs=' . $defaultsJson . ';'
+			. 'Array.from(sel.options).forEach(function(o){o.selected=defs.indexOf(o.value)!==-1;});'
+			. 'return false;'
+			. '"><span class="icon-refresh" aria-hidden="true"></span> Reset to defaults</a>'
+			. '</div>';
+
+		return $html;
+	}
+}

src/packages/plg_system_mokowaas/mokowaas.xml

@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+
+ This file is part of a Moko Consulting project.
+
+ SPDX-LICENSE-IDENTIFIER: GPL-3.0-or-later
+
+ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License (./LICENSE.md).
+
+ # FILE INFORMATION
+ DEFGROUP: Joomla.Plugin
+ INGROUP: MokoWaaS
+ REPO: https://github.com/mokoconsulting-tech/mokowaas
+ VERSION: 02.32.04
+ PATH: /src/mokowaas.xml
+ BRIEF: Plugin manifest for MokoWaaS system plugin
+ NOTE: Defines installation metadata, files, and configuration for Joomla
+-->
+<extension type="plugin" group="system" method="upgrade">
+	<name>System - MokoWaaS</name>
+	<element>mokowaas</element>
+	<author>Moko Consulting</author>
+	<creationDate>2026-05-22</creationDate>
+	<copyright>Copyright (C) 2025 Moko Consulting. All rights reserved.</copyright>
+	<license>GNU General Public License version 3 or later; see LICENSE.md</license>
+	<authorEmail>hello@mokoconsulting.tech</authorEmail>
+	<authorUrl>https://mokoconsulting.tech</authorUrl>
+	<version>02.34.00</version>
+	<description>This plugin rebrands the Joomla system interface with MokoWaaS identity. It applies language overrides and ensures consistent branding across the platform.</description>
+	<namespace path=".">Moko\Plugin\System\MokoWaaS</namespace>
+	<scriptfile>script.php</scriptfile>
+
+	<files>
+		<filename plugin="mokowaas">script.php</filename>
+		<folder>Extension</folder>
+		<folder>Field</folder>
+		<folder>Helper</folder>
+		<folder>Service</folder>
+		<folder>forms</folder>
+		<folder>payload</folder>
+		<folder>services</folder>
+		<folder>language</folder>
+		<folder>administrator</folder>
+	</files>
+
+	<media destination="plg_system_mokowaas" folder="media">
+		<filename>index.html</filename>
+		<filename>favicon.ico</filename>
+		<filename>favicon.svg</filename>
+		<filename>favicon_256.png</filename>
+		<filename>logo.png</filename>
+	</media>
+
+	<languages folder="language">
+		<language tag="en-GB">en-GB/plg_system_mokowaas.ini</language>
+		<language tag="en-US">en-US/plg_system_mokowaas.ini</language>
+	</languages>
+
+	<languages folder="administrator/language">
+		<language tag="en-GB">en-GB/plg_system_mokowaas.sys.ini</language>
+		<language tag="en-US">en-US/plg_system_mokowaas.sys.ini</language>
+	</languages>
+
+	<administration>
+		<files folder="administrator">
+			<folder>language</folder>
+		</files>
+	</administration>
+
+	<config>
+		<fields name="params"
+			addfieldprefix="Moko\Plugin\System\MokoWaaS\Field"
+			>
+			<fieldset name="basic">
+				<field
+					name="health_api_token"
+					type="CopyableToken"
+					label="PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_HEALTH_TOKEN_DESC"
+					default=""
+					filter="raw"
+					readonly="true"
+					/>
+				<field name="dev_mode" type="radio" default="0"
+					label="PLG_SYSTEM_MOKOWAAS_DEV_MODE_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_DEV_MODE_DESC"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field
+					name="reset_hits"
+					type="radio"
+					label="PLG_SYSTEM_MOKOWAAS_RESET_HITS_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_RESET_HITS_DESC"
+					default="0"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field
+					name="delete_versions"
+					type="radio"
+					label="PLG_SYSTEM_MOKOWAAS_DELETE_VERSIONS_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_DELETE_VERSIONS_DESC"
+					default="0"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+			</fieldset>
+			<fieldset name="tenant_restrictions"
+				label="PLG_SYSTEM_MOKOWAAS_FIELDSET_TENANT_LABEL"
+				description="PLG_SYSTEM_MOKOWAAS_FIELDSET_TENANT_DESC"
+				>
+				<field name="restrict_installer" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_RESTRICT_INSTALLER_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_RESTRICT_INSTALLER_DESC"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="allow_extension_updates" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_ALLOW_UPDATES_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_ALLOW_UPDATES_DESC"
+					class="btn-group btn-group-yesno"
+					showon="restrict_installer:1">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="hide_sysinfo" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_HIDE_SYSINFO_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_HIDE_SYSINFO_DESC"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="restrict_global_config" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_RESTRICT_CONFIG_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_RESTRICT_CONFIG_DESC"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="restrict_template_editing" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_RESTRICT_TEMPLATE_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_RESTRICT_TEMPLATE_DESC"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="disable_install_url" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_DISABLE_INSTALL_URL_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_DISABLE_INSTALL_URL_DESC"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="hidden_menu_items" type="textarea"
+					label="PLG_SYSTEM_MOKOWAAS_HIDDEN_MENUS_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_HIDDEN_MENUS_DESC"
+					rows="5" filter="raw" />
+			</fieldset>
+			<fieldset name="demo_mode"
+			label="PLG_SYSTEM_MOKOWAAS_FIELDSET_DEMO_LABEL"
+			description="PLG_SYSTEM_MOKOWAAS_FIELDSET_DEMO_DESC"
+			addfieldprefix="Moko\Plugin\System\MokoWaaS\Field"
+			>
+			<field name="demo_scheduled_task" type="DemoTaskInfo"
+				label="PLG_SYSTEM_MOKOWAAS_DEMO_TASK_INFO_LABEL"
+				/>
+		</fieldset>
+		<fieldset name="security"
+				label="PLG_SYSTEM_MOKOWAAS_FIELDSET_SECURITY_LABEL"
+				description="PLG_SYSTEM_MOKOWAAS_FIELDSET_SECURITY_DESC"
+				addfieldprefix="Moko\Plugin\System\MokoWaaS\Field"
+				>
+				<field
+					name="emergency_access"
+					type="radio"
+					label="PLG_SYSTEM_MOKOWAAS_EMERGENCY_ACCESS_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_EMERGENCY_ACCESS_DESC"
+					default="1"
+					class="btn-group btn-group-yesno"
+					>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field
+					name="allowed_ips_display"
+					type="AllowedIps"
+					label=""
+					/>
+				<field name="force_https" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_FORCE_HTTPS_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_FORCE_HTTPS_DESC"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="admin_session_timeout" type="number"
+					label="PLG_SYSTEM_MOKOWAAS_SESSION_TIMEOUT_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_SESSION_TIMEOUT_DESC"
+					default="60" hint="Minutes (0 = Joomla default)" />
+				<field
+					name="current_ip_display"
+					type="CurrentIp"
+					label=""
+					/>
+				<field
+					name="trusted_ips"
+					type="subform"
+					label="PLG_SYSTEM_MOKOWAAS_TRUSTED_IPS_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_TRUSTED_IPS_DESC"
+					formsource="plugins/system/mokowaas/forms/trusted_ip_entry.xml"
+					multiple="true"
+					layout="joomla.form.field.subform.repeatable-table"
+					groupByFieldset="false"
+					buttons="add,remove,move"
+					/>
+				<field name="password_min_length" type="number" default="12"
+					label="PLG_SYSTEM_MOKOWAAS_PASSWORD_LENGTH_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_PASSWORD_LENGTH_DESC" />
+				<field name="password_require_uppercase" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_PASSWORD_UPPER_LABEL"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="password_require_number" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_PASSWORD_NUMBER_LABEL"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="password_require_special" type="radio" default="1"
+					label="PLG_SYSTEM_MOKOWAAS_PASSWORD_SPECIAL_LABEL"
+					class="btn-group btn-group-yesno">
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
+				</field>
+				<field name="upload_allowed_types" type="text"
+					label="PLG_SYSTEM_MOKOWAAS_UPLOAD_TYPES_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_UPLOAD_TYPES_DESC"
+					default="jpg,jpeg,png,gif,webp,svg,pdf,doc,docx,xls,xlsx" />
+				<field name="upload_max_size_mb" type="number"
+					label="PLG_SYSTEM_MOKOWAAS_UPLOAD_SIZE_LABEL"
+					description="PLG_SYSTEM_MOKOWAAS_UPLOAD_SIZE_DESC"
+					default="100" />
+			</fieldset>
+		</fields>
+	</config>
+</extension>