chore: create updates.xml with current releases [skip ci]

chore: update server name + consolidate changelog

.mokogitea/workflows/auto-release.yml

@@ -102,13 +102,14 @@ jobs:
         run: |
           php /tmp/moko-platform-api/cli/release_publish.php \
             --path . --stability rc --bump minor --branch rc \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}"
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --skip-update-stream
 
       - name: Summary
         if: always()
         run: |
           echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY
-          echo "Branch renamed to rc, minor bump, RC + lesser stream releases built, updates.xml synced" >> $GITHUB_STEP_SUMMARY
+          echo "Branch renamed to rc, minor bump, RC release built (updates.xml managed by Gitea Pages)" >> $GITHUB_STEP_SUMMARY
 
   # ── Merged PR → Build & Release (or promote RC to stable) ────────────────────
   release:
@@ -167,7 +168,8 @@ jobs:
         run: |
           php /tmp/moko-platform-api/cli/release_publish.php \
             --path . --stability stable --bump minor --branch main \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}"
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --skip-update-stream
 
       # -- STEP 9: Mirror to GitHub (stable only) --------------------------------
       - name: "Step 9: Mirror release to GitHub"

.mokogitea/workflows/pr-check.yml

@@ -105,6 +105,19 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Check for merge conflict markers
+        run: |
+          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
+          if [ -n "$CONFLICTS" ]; then
+            echo "::error::Merge conflict markers found in source files"
+            echo "## Conflict Markers Found" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          echo "No conflict markers found"
+
       - name: Detect platform
         id: platform
         run: |
@@ -134,6 +147,98 @@ jobs:
           echo "PHP lint: ${ERRORS} error(s)"
           [ "$ERRORS" -eq 0 ] || { echo "::error::PHP syntax errors found"; exit 1; }
 
+      - name: Joomla JEXEC guard check
+        if: steps.platform.outputs.platform == 'joomla'
+        run: |
+          ERRORS=0
+          while IFS= read -r -d '' file; do
+            # Skip vendor, node_modules, and index.html stub files
+            case "$file" in ./vendor/*|./node_modules/*) continue ;; esac
+            # Check first 10 lines for JEXEC or JPATH guard
+            if ! head -20 "$file" | grep -qE "defined\s*\(\s*['\"](_JEXEC|JPATH_BASE|\\\\JPATH_PLATFORM)['\"]"; then
+              echo "::error file=${file}::Missing JEXEC guard: ${file}"
+              ERRORS=$((ERRORS + 1))
+            fi
+          done < <(find . -name "*.php" -path "*/src/*" -not -path "./.git/*" -not -path "./vendor/*" -print0)
+          if [ "$ERRORS" -gt 0 ]; then
+            echo "::error::${ERRORS} PHP file(s) missing defined('_JEXEC') or die guard"
+            echo "## JEXEC Guard Check: Failed" >> $GITHUB_STEP_SUMMARY
+            echo "${ERRORS} file(s) in src/ are missing the Joomla execution guard." >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          echo "JEXEC guard: OK"
+
+      - name: Joomla directory listing protection
+        if: steps.platform.outputs.platform == 'joomla'
+        run: |
+          MISSING=0
+          SOURCE_DIR="src"
+          [ ! -d "$SOURCE_DIR" ] && exit 0
+          while IFS= read -r dir; do
+            if [ ! -f "${dir}/index.html" ]; then
+              echo "::warning::Missing index.html in ${dir} (directory listing protection)"
+              MISSING=$((MISSING + 1))
+            fi
+          done < <(find "$SOURCE_DIR" -type d -not -path "./.git/*" -not -path "*/vendor/*" -not -path "*/node_modules/*")
+          if [ "$MISSING" -gt 0 ]; then
+            echo "## Directory Protection" >> $GITHUB_STEP_SUMMARY
+            echo "${MISSING} director(ies) missing index.html" >> $GITHUB_STEP_SUMMARY
+          fi
+          echo "Directory protection: ${MISSING} missing (advisory)"
+
+      - name: Joomla script file and asset checks
+        if: steps.platform.outputs.platform == 'joomla'
+        run: |
+          ERRORS=0
+          MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '<extension' {} \; 2>/dev/null | head -1)
+          [ -z "$MANIFEST" ] && exit 0
+          MANIFEST_DIR=$(dirname "$MANIFEST")
+
+          # Check scriptfile exists if declared
+          SCRIPTFILE=$(sed -n 's/.*<scriptfile>\([^<]*\)<\/scriptfile>.*/\1/p' "$MANIFEST" 2>/dev/null)
+          if [ -n "$SCRIPTFILE" ]; then
+            if [ ! -f "${MANIFEST_DIR}/${SCRIPTFILE}" ]; then
+              echo "::error::Manifest declares <scriptfile>${SCRIPTFILE}</scriptfile> but file not found at ${MANIFEST_DIR}/${SCRIPTFILE}"
+              ERRORS=$((ERRORS + 1))
+            else
+              echo "Script file: ${MANIFEST_DIR}/${SCRIPTFILE} (OK)"
+            fi
+          fi
+
+          # Require joomla.asset.json and validate it
+          ASSET_JSON=$(find "$MANIFEST_DIR" -name "joomla.asset.json" -not -path "./.git/*" 2>/dev/null | head -1)
+          if [ -z "$ASSET_JSON" ]; then
+            echo "::error::joomla.asset.json not found — Joomla asset system is required"
+            ERRORS=$((ERRORS + 1))
+          else
+            if command -v php &> /dev/null; then
+              php -r "json_decode(file_get_contents('$ASSET_JSON')); if(json_last_error()!==JSON_ERROR_NONE){echo json_last_error_msg();exit(1);}" 2>&1 || {
+                echo "::error::joomla.asset.json is not valid JSON"
+                ERRORS=$((ERRORS + 1))
+              }
+            fi
+            echo "joomla.asset.json: valid"
+          fi
+
+          # Validate all XML files in src/ are well-formed
+          XML_ERRORS=0
+          if command -v php &> /dev/null; then
+            while IFS= read -r -d '' xmlfile; do
+              if ! php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('$xmlfile'); if(!\$x){foreach(libxml_get_errors() as \$e) echo trim(\$e->message) . ' in $xmlfile'; exit(1);}" 2>&1; then
+                XML_ERRORS=$((XML_ERRORS + 1))
+              fi
+            done < <(find "$MANIFEST_DIR" -name "*.xml" -not -path "./.git/*" -print0)
+          fi
+          if [ "$XML_ERRORS" -gt 0 ]; then
+            echo "::error::${XML_ERRORS} XML file(s) are malformed"
+            ERRORS=$((ERRORS + 1))
+          else
+            echo "XML well-formedness: OK"
+          fi
+
+          [ "$ERRORS" -gt 0 ] && exit 1
+          echo "Joomla asset checks: OK"
+
       - name: Validate platform manifest
         run: |
           PLATFORM="${{ steps.platform.outputs.platform }}"
@@ -151,6 +256,13 @@ jobs:
               for ELEMENT in name version description; do
                 grep -q "<${ELEMENT}>" "$MANIFEST" || { echo "::error::Missing <${ELEMENT}> in manifest"; exit 1; }
               done
+              # Block legacy raw/branch update server URLs on MokoGitea
+              RAW_URLS=$(grep -n 'raw/branch' "$MANIFEST" | grep -i 'mokoconsulting\|mokogitea\|git\.mokoconsulting\.tech' || true)
+              if [ -n "$RAW_URLS" ]; then
+                echo "::error::Manifest contains legacy raw/branch update server URL on MokoGitea. Use the Gitea Pages URL instead (e.g. /{REPO}/updates.xml not /{REPO}/raw/branch/main/updates.xml)"
+                echo "$RAW_URLS"
+                exit 1
+              fi
               echo "Joomla manifest valid"
               ;;
             dolibarr)
@@ -183,6 +295,138 @@ jobs:
               ;;
           esac
 
+      - name: Validate Joomla language files
+        if: steps.platform.outputs.platform == 'joomla'
+        run: |
+          ERRORS=0
+          WARNINGS=0
+
+          # Require both en-GB and en-US language directories
+          LANG_ROOT=$(find . -path "*/language" -type d -not -path "./.git/*" 2>/dev/null | head -1)
+          if [ -z "$LANG_ROOT" ]; then
+            echo "No language/ directory found — skipping"
+            exit 0
+          fi
+
+          if [ ! -d "$LANG_ROOT/en-GB" ]; then
+            echo "::error::Missing en-GB language directory (${LANG_ROOT}/en-GB)"
+            ERRORS=$((ERRORS + 1))
+          fi
+          if [ ! -d "$LANG_ROOT/en-US" ]; then
+            echo "::error::Missing en-US language directory (${LANG_ROOT}/en-US)"
+            ERRORS=$((ERRORS + 1))
+          fi
+
+          # Check that en-GB and en-US have matching .ini files
+          if [ -d "$LANG_ROOT/en-GB" ] && [ -d "$LANG_ROOT/en-US" ]; then
+            for GB_INI in "$LANG_ROOT/en-GB"/*.ini; do
+              [ ! -f "$GB_INI" ] && continue
+              US_INI="$LANG_ROOT/en-US/$(basename "$GB_INI")"
+              if [ ! -f "$US_INI" ]; then
+                echo "::error::$(basename "$GB_INI") exists in en-GB but missing from en-US"
+                ERRORS=$((ERRORS + 1))
+              fi
+            done
+            for US_INI in "$LANG_ROOT/en-US"/*.ini; do
+              [ ! -f "$US_INI" ] && continue
+              GB_INI="$LANG_ROOT/en-GB/$(basename "$US_INI")"
+              if [ ! -f "$GB_INI" ]; then
+                echo "::error::$(basename "$US_INI") exists in en-US but missing from en-GB"
+                ERRORS=$((ERRORS + 1))
+              fi
+            done
+          fi
+
+          # Find all .ini language files
+          INI_FILES=$(find . -path "*/language/*/*.ini" -not -path "./.git/*" 2>/dev/null)
+          if [ -z "$INI_FILES" ]; then
+            echo "No .ini language files found"
+            [ "$ERRORS" -gt 0 ] && exit 1
+            exit 0
+          fi
+
+          echo "Found $(echo "$INI_FILES" | wc -l) language file(s)"
+
+          for FILE in $INI_FILES; do
+            FNAME=$(basename "$FILE")
+            LINENUM=0
+            SEEN_KEYS=""
+
+            while IFS= read -r line || [ -n "$line" ]; do
+              LINENUM=$((LINENUM + 1))
+
+              # Skip empty lines and comments
+              [ -z "$line" ] && continue
+              echo "$line" | grep -qE '^\s*;' && continue
+              echo "$line" | grep -qE '^\s*$' && continue
+
+              # Must match KEY="VALUE" format
+              if ! echo "$line" | grep -qE '^[A-Z_][A-Z0-9_]*=".*"$'; then
+                echo "::error file=${FILE},line=${LINENUM}::Malformed line: ${line}"
+                ERRORS=$((ERRORS + 1))
+                continue
+              fi
+
+              # Extract key and check for duplicates
+              KEY=$(echo "$line" | sed 's/=.*//')
+              if echo "$SEEN_KEYS" | grep -qx "$KEY"; then
+                echo "::error file=${FILE},line=${LINENUM}::Duplicate key: ${KEY}"
+                ERRORS=$((ERRORS + 1))
+              fi
+              SEEN_KEYS="${SEEN_KEYS}
+          ${KEY}"
+            done < "$FILE"
+
+            echo "  ${FILE}: checked ${LINENUM} lines"
+          done
+
+          # Cross-check en-GB vs en-US key consistency
+          GB_DIR=$(find . -path "*/language/en-GB" -type d -not -path "./.git/*" 2>/dev/null | head -1)
+          US_DIR=$(find . -path "*/language/en-US" -type d -not -path "./.git/*" 2>/dev/null | head -1)
+
+          if [ -n "$GB_DIR" ] && [ -n "$US_DIR" ]; then
+            for GB_FILE in "$GB_DIR"/*.ini; do
+              [ ! -f "$GB_FILE" ] && continue
+              FNAME=$(basename "$GB_FILE")
+              US_FILE="$US_DIR/$FNAME"
+              [ ! -f "$US_FILE" ] && continue
+
+              GB_KEYS=$(grep -oP '^[A-Z_][A-Z0-9_]*(?==)' "$GB_FILE" 2>/dev/null | sort)
+              US_KEYS=$(grep -oP '^[A-Z_][A-Z0-9_]*(?==)' "$US_FILE" 2>/dev/null | sort)
+
+              # Keys in en-GB but not en-US
+              MISSING_US=$(comm -23 <(echo "$GB_KEYS") <(echo "$US_KEYS"))
+              if [ -n "$MISSING_US" ]; then
+                echo "::warning::Keys in en-GB/$FNAME but missing from en-US/$FNAME:"
+                echo "$MISSING_US" | while read -r k; do echo "  - $k"; done
+                WARNINGS=$((WARNINGS + 1))
+              fi
+
+              # Keys in en-US but not en-GB
+              MISSING_GB=$(comm -13 <(echo "$GB_KEYS") <(echo "$US_KEYS"))
+              if [ -n "$MISSING_GB" ]; then
+                echo "::warning::Keys in en-US/$FNAME but missing from en-GB/$FNAME:"
+                echo "$MISSING_GB" | while read -r k; do echo "  - $k"; done
+                WARNINGS=$((WARNINGS + 1))
+              fi
+            done
+          fi
+
+          {
+            echo "### Language File Validation"
+            echo "| Metric | Count |"
+            echo "|---|---|"
+            echo "| Files checked | $(echo "$INI_FILES" | wc -l) |"
+            echo "| Errors | ${ERRORS} |"
+            echo "| Warnings | ${WARNINGS} |"
+          } >> $GITHUB_STEP_SUMMARY
+
+          if [ "$ERRORS" -gt 0 ]; then
+            echo "::error::Language validation failed with ${ERRORS} error(s)"
+            exit 1
+          fi
+          echo "Language files: OK (${WARNINGS} warning(s))"
+
       - name: Check changelog has unreleased entry
         run: |
           if [ ! -f "CHANGELOG.md" ]; then

.mokogitea/workflows/pre-release.yml

@@ -17,6 +17,10 @@ on:
     types: [closed]
     branches:
       - dev
+  pull_request_target:
+    types: [synchronize, opened, reopened]
+    branches:
+      - main
   workflow_dispatch:
     inputs:
       stability:
@@ -43,7 +47,8 @@ jobs:
     runs-on: release
     if: >-
       github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'dev')
+      (github.event_name == 'pull_request' && github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'dev') ||
+      (github.event_name == 'pull_request_target' && github.event.pull_request.base.ref == 'main')
 
     steps:
       - name: Checkout
@@ -51,6 +56,7 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.MOKOGITEA_TOKEN }}
+          ref: ${{ github.event_name == 'pull_request_target' && github.event.pull_request.head.sha || '' }}
 
       - name: Setup moko-platform tools
         env:
@@ -60,7 +66,7 @@ jobs:
           if ! command -v composer &> /dev/null; then
             sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
+          # Always fetch latest CLI tools — never use stale cache from previous runs
           rm -rf /tmp/moko-platform-api
           git clone --depth 1 --branch main --quiet \
             "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
@@ -76,7 +82,12 @@ jobs:
       - name: Resolve metadata and bump version
         id: meta
         run: |
-          STABILITY="${{ inputs.stability || 'development' }}"
+          # Auto-detect stability: RC for PRs targeting main, else use input or default to development
+          if [ "${{ github.event_name }}" = "pull_request_target" ] && [ "${{ github.event.pull_request.base.ref }}" = "main" ]; then
+            STABILITY="release-candidate"
+          else
+            STABILITY="${{ inputs.stability || 'development' }}"
+          fi
 
           case "$STABILITY" in
             development)        SUFFIX="-dev";   TAG="development" ;;
@@ -144,6 +155,21 @@ jobs:
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
             --repo "${GITEA_REPO}" --branch dev --prerelease
 
+      - name: Ensure prerelease flag
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+          # Get release ID by tag and force prerelease=true
+          RELEASE_ID=$(curl -s "${API_BASE}/releases/tags/${TAG}" \
+            -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" | jq -r '.id // empty')
+          if [ -n "$RELEASE_ID" ]; then
+            curl -s -X PATCH "${API_BASE}/releases/${RELEASE_ID}" \
+              -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+              -H "Content-Type: application/json" \
+              -d '{"prerelease": true}'
+            echo "Marked release ${TAG} (id=${RELEASE_ID}) as prerelease"
+          fi
+
       - name: Build package and upload
         id: package
         run: |

CHANGELOG.md

@@ -13,14 +13,24 @@
  -->
 
 # Changelog — MokoOnyx (VERSION: 02.20.00)
+
 ## [Unreleased]
 
 ## [02.20.00] --- 2026-06-04
 
-## [02.19.00] --- 2026-06-04
+### Fixed
+- Strip Joomla-injected `p-2` padding class from Font Awesome icons in all menu overrides (default, mainmenu, horizontal)
+
+### Changed
+- Migrated update server URL from raw file endpoint to Gitea Pages
+- Release workflow no longer manages updates.xml (decoupled to Gitea Pages)
+- Added conflict-marker guard to PR check and release workflows
+- Added Joomla language file validation (syntax, duplicates, en-GB/en-US consistency)
+- Added JEXEC guard, joomla.asset.json, XML well-formedness, and script file CI checks
+- Removed RS_FTP_PATH_SUFFIX from repo health requirements
+
+## [02.20.00] --- 2026-06-04
 
 ## [02.18.00] --- 2026-06-02
 
-## [02.17.00] --- 2026-06-02
-
 ## [02.15.00] --- 2026-05-30

src/html/mod_menu/default_component.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/default_heading.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/default_separator.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/default_url.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_component.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_heading.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_separator.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_url.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/mainmenu_component.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/html/mod_menu/mainmenu_heading.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/html/mod_menu/mainmenu_separator.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/html/mod_menu/mainmenu_url.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/templateDetails.xml

@@ -31,9 +31,7 @@
 -->
 <extension type="template" client="site" method="upgrade">
 	<updateservers>
-		<server type="extension" priority="1" name="MokoOnyx Update Server (MokoGitea)">
-			https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/updates.xml
-		</server>
+		<server type="extension" name="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/updates.xml</server>
 	</updateservers>
 	<name>mokoonyx</name>
 	<version>02.20.00</version>

updates.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!-- Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
  SPDX-License-Identifier: GPL-3.0-or-later
- VERSION: 02.20.00-dev
+ VERSION: 02.20.00
  -->
 
 <updates>
@@ -11,18 +11,18 @@
     <element>mokoonyx</element>
     <type>template</type>
     <client>site</client>
-    <version>02.19.02-dev</version>
+    <version>02.19.04-dev</version>
     <creationDate>2026-06-04</creationDate>
-    <infourl title='Template - MokoOnyx'>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/development</infourl>
+    <infourl title="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/development</infourl>
     <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/development/tpl_mokoonyx-02.19.02-dev.zip</downloadurl>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/development/tpl_mokoonyx-02.19.04-dev.zip</downloadurl>
     </downloads>
-    <sha256>5811cc175564744865053f5a2cf259e66016c4e41f2d87571d19b1dd5f7fd8ba</sha256>
+    <sha256>b5d1db0be2db98858a16902336fd19a47a39d4597f826a90e1d7fa58e40e29e2</sha256>
     <tags><tag>dev</tag></tags>
     <changelogurl>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md</changelogurl>
     <maintainer>Moko Consulting</maintainer>
     <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name="joomla" version="(5|6)\..*" />
+    <targetplatform name="joomla" version="(5|6)\..*"/>
     <php_minimum>8.1.0</php_minimum>
   </update>
   <update>
@@ -31,13 +31,13 @@
     <element>mokoonyx</element>
     <type>template</type>
     <client>site</client>
-    <version>02.19.00</version>
+    <version>02.20.00</version>
     <creationDate>2026-06-04</creationDate>
     <infourl title="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/stable</infourl>
     <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/stable/tpl_mokoonyx-02.19.00.zip</downloadurl>
+      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/stable/tpl_mokoonyx-02.20.00.zip</downloadurl>
     </downloads>
-    <sha256>1b4907b450be64d1d23ea0da4314e542e6abf2c9e6e2085ad4b2e49079bd1d83</sha256>
+    <sha256>7fe031b49d2908d161378213a9aa9bcf807ef0ee101d39bba077df4f73a60f30</sha256>
     <tags><tag>stable</tag></tags>
     <changelogurl>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md</changelogurl>
     <maintainer>Moko Consulting</maintainer>