chore(version): pre-release bump to 01.07.34-dev [skip ci]

Claude-Session: https://claude.ai/code/session_01B9aZHSWbiiZykJD88pYx8R

.mokogitea/workflows/issue-branch.yml

@@ -5,7 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: mokocli.Automation
-# VERSION: 01.07.28
+# VERSION: 01.07.34
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

CHANGELOG.md

@@ -1,6 +1,10 @@
 # MokoSuite NPO
 Nonprofit management for MokoSuite. Layer 2 add-on (requires CRM).
 
+## [Unreleased]
+### Fixed
+- Installer no longer shows the "license / next-steps" success message when a bundled child extension failed to install. The package `postflight` now verifies every child declared in the manifest actually landed in `#__extensions` and shows an honest error instead. Fails open so a transient glitch never fakes a failure.
+
 ## Features
 - Donor management with giving levels
 - Donation tracking with fund allocation

source/packages/com_mokosuitenpo/admin/language/en-GB/com_mokosuitenpo.sys.ini

@@ -0,0 +1,3 @@
+COM_MOKOSUITENPO="MokoSuite NPO"
+COM_MOKOSUITENPO_SHORT="NPO"
+COM_MOKOSUITENPO_XML_DESCRIPTION="MokoSuite NPO component."

source/packages/com_mokosuitenpo/mokosuitenpo.xml

@@ -7,13 +7,16 @@
 	<license>GPL-3.0-or-later</license>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
 	<authorUrl>https://mokoconsulting.tech</authorUrl>
-	<version>01.07.28</version>
+	<version>01.07.34</version>
 	<php_minimum>8.3</php_minimum>
-	<description>MokoSuite NPO component</description>
+	<description>COM_MOKOSUITENPO_XML_DESCRIPTION</description>
 	<namespace path="src">Moko\Component\MokoSuiteNpo</namespace>
 	<administration>
-		<menu>MokoSuite NPO</menu>
+		<menu>COM_MOKOSUITENPO_SHORT</menu>
-		<files folder="admin"><folder>src</folder><folder>services</folder><folder>tmpl</folder></files>
+		<files folder="admin"><folder>language</folder><folder>src</folder><folder>services</folder><folder>tmpl</folder></files>
+		<languages folder="admin/language">
+			<language tag="en-GB">en-GB/com_mokosuitenpo.sys.ini</language>
+		</languages>
 	</administration>
 	<files folder="site"><folder>src</folder><folder>tmpl</folder></files>
 	<api><files folder="api"><folder>src</folder></files></api>

source/pkg_mokosuitenpo.xml

@@ -2,7 +2,7 @@
 <extension type="package" method="upgrade">
 	<name>Package - MokoSuite NPO</name>
 	<packagename>mokosuitenpo</packagename>
-	<version>01.07.28</version>
+	<version>01.07.34</version>
 	<creationDate>2026-06-11</creationDate>
 	<author>Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>

source/script.php

@@ -1,10 +1,9 @@
 <?php
 /**
- * MokoSuite NPO Package Install Script
+ * @package     MokoSuiteNPO
- *
+ * @subpackage  pkg_mokosuitenpo
- * @package     MokoSuite NPO
  * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
- * @license     GPL-3.0-or-later
+ * @license     GNU General Public License version 3 or later; see LICENSE
  */
 
 defined('_JEXEC') or die;
@@ -12,73 +11,153 @@ defined('_JEXEC') or die;
 use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\InstallerAdapter;
 use Joomla\CMS\Log\Log;
-use Joomla\Database\DatabaseInterface;
 
+/**
+ * Package installation script for MokoSuiteNPO.
+ */
 class Pkg_MokoSuiteNPOInstallerScript
 {
-	private string $savedDlid = '';
-
-	public function preflight(string $type, InstallerAdapter $adapter): bool
-	{
-		if ($type === 'update')
-		{
-			$this->savedDlid = $this->getExistingDlid();
-		}
-
-		return true;
-	}
-
 	public function postflight(string $type, InstallerAdapter $adapter): void
 	{
-		if ($this->savedDlid)
+		// Be honest about success. Joomla's package installer only LOGS a failed
-		{
+		// child sub-install but still runs this postflight, so don't show the
-			$this->restoreDlid($this->savedDlid);
+		// license / next-steps message if a bundled extension is actually missing.
-		}
+		// Fails open (see missingChildExtensions) so a glitch never fakes a failure.
-
+		$missing = $this->missingChildExtensions($adapter);
-		if ($type === 'install')
-		{
-			$missing = $this->verifyChildren($adapter);
 
 		if (!empty($missing))
 		{
 			Factory::getApplication()->enqueueMessage(
-					'<strong>MokoSuite NPO — Incomplete Installation</strong><br>'
+				'<h4>MokoSuiteNPO did not install correctly.</h4>'
-					. 'The following extensions failed to install: '
+				. '<p>The following bundled extensions are missing: '
-					. implode(', ', $missing)
+				. htmlspecialchars(implode(', ', $missing), ENT_QUOTES) . '</p>'
-					. '.<br>Please check file permissions and server logs, then reinstall the package.',
+				. '<p>Please uninstall MokoSuiteNPO and reinstall the full package.</p>',
 				'error'
 			);
 
 			return;
 		}
 
-			$this->enablePlugin('system', 'mokosuitenpo');
+		$this->warnMissingLicenseKey();
-			$this->enablePlugin('webservices', 'mokosuitenpo');
-			$this->enablePlugin('task', 'mokosuitenpo_task');
 	}
 
-		$dlid = $this->getExistingDlid();
+	/**
-
+	 * Verify every child extension declared in the package manifest actually
-		if (empty($dlid))
+	 * landed in #__extensions. Returns readable labels of any that are missing.
+	 *
+	 * Matching per Joomla's #__extensions uniqueness:
+	 *   - type    = the <file> "type" attribute
+	 *   - element = the <file> "id" attribute, EXCEPT for plugins where the
+	 *               manifest declares the full plg_<group>_<element> id, so a
+	 *               leading plg_<group>_ is stripped to get the real element
+	 *   - plugins ALSO match folder = the <file> "group" attribute
+	 *
+	 * FAILS OPEN: any error (unreadable manifest, query failure) returns [] so a
+	 * transient glitch never turns a good install into a false failure.
+	 *
+	 * @param   InstallerAdapter  $adapter  The package installer adapter.
+	 *
+	 * @return  string[]  Labels of missing child extensions.
+	 */
+	private function missingChildExtensions(InstallerAdapter $adapter): array
 	{
-			$app = Factory::getApplication();
-
 		try
 		{
-				$db = Factory::getContainer()->get(DatabaseInterface::class);
+			$manifest = $adapter->getParent()->getManifest();
-				$db->setQuery(
+
-					$db->getQuery(true)
+			if (!$manifest || !isset($manifest->files) || !isset($manifest->files->file))
-						->select($db->quoteName('update_site_id'))
+			{
-						->from($db->quoteName('#__update_sites'))
+				return [];
-						->where($db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteNPO%'))
+			}
-						->setLimit(1)
+
-				);
+			$db      = Factory::getDbo();
-				$siteId = (int) $db->loadResult();
+			$missing = [];
-				$editUrl = $siteId
+
-					? 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . $siteId
+			foreach ($manifest->files->file as $file)
-					: 'index.php?option=com_installer&view=updatesites';
+			{
+				$attrs  = $file->attributes();
+				$id     = isset($attrs['id']) ? (string) $attrs['id'] : '';
+				$exType = isset($attrs['type']) ? (string) $attrs['type'] : '';
+
+				if ($id === '' || $exType === '')
+				{
+					continue;
+				}
+
+				$group   = isset($attrs['group']) ? (string) $attrs['group'] : '';
+				$element = $id;
+
+				// Plugin element in #__extensions is the id minus any leading plg_<group>_.
+				if ($exType === 'plugin' && $group !== '')
+				{
+					$prefix = 'plg_' . $group . '_';
+
+					if (strpos($element, $prefix) === 0)
+					{
+						$element = substr($element, \strlen($prefix));
+					}
+				}
+
+				$query = $db->getQuery(true)
+					->select('COUNT(*)')
+					->from($db->quoteName('#__extensions'))
+					->where($db->quoteName('element') . ' = ' . $db->quote($element))
+					->where($db->quoteName('type') . ' = ' . $db->quote($exType));
+
+				if ($exType === 'plugin' && $group !== '')
+				{
+					$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
+				}
+
+				if ((int) $db->setQuery($query)->loadResult() === 0)
+				{
+					$label     = trim((string) $file);
+					$missing[] = $label !== '' ? preg_replace('/\.zip$/i', '', $label) : $id;
+				}
+			}
+
+			return $missing;
 		}
 		catch (\Throwable $e)
+		{
+			// Fail open — never fake a failure on a glitch.
+			return [];
+		}
+	}
+
+	private function warnMissingLicenseKey(): void
+	{
+		try
+		{
+			$db  = Factory::getDbo();
+			$app = Factory::getApplication();
+
+			$query = $db->getQuery(true)
+				->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')])
+				->from($db->quoteName('#__update_sites'))
+				->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteNPO%')
+					. ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoSuiteNPO%') . ')')
+				->setLimit(1);
+			$db->setQuery($query);
+			$site = $db->loadObject();
+
+			if ($site)
+			{
+				$extraQuery = (string) ($site->extra_query ?? '');
+
+				if (!empty($extraQuery) && strpos($extraQuery, 'dlid=') !== false)
+				{
+					parse_str($extraQuery, $parsed);
+
+					if (!empty($parsed['dlid']))
+					{
+						return;
+					}
+				}
+
+				$editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
+			}
+			else
 			{
 				$editUrl = 'index.php?option=com_installer&view=updatesites';
 			}
@@ -90,130 +169,9 @@ class Pkg_MokoSuiteNPOInstallerScript
 				'warning'
 			);
 		}
-	}
-
-	private function verifyChildren(InstallerAdapter $adapter): array
-	{
-		try
-		{
-			$manifest = $adapter->getParent()->getManifest();
-			$files    = $manifest->files->file ?? [];
-
-			if (!$files)
-			{
-				return [];
-			}
-
-			$db      = Factory::getContainer()->get(DatabaseInterface::class);
-			$missing = [];
-
-			foreach ($files as $file)
-			{
-				$type  = (string) ($file['type'] ?? '');
-				$id    = (string) ($file['id'] ?? '');
-				$group = (string) ($file['group'] ?? '');
-
-				if ($type === '' || $id === '')
-				{
-					continue;
-				}
-
-				$element = ($type === 'plugin' && $group !== '')
-					? preg_replace('/^plg_' . preg_quote($group, '/') . '_/', '', $id)
-					: $id;
-
-				$query = $db->getQuery(true)
-					->select('COUNT(*)')
-					->from($db->quoteName('#__extensions'))
-					->where($db->quoteName('element') . ' = ' . $db->quote($element))
-					->where($db->quoteName('type') . ' = ' . $db->quote($type));
-
-				if ($type === 'plugin' && $group !== '')
-				{
-					$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
-				}
-
-				$db->setQuery($query);
-
-				if ((int) $db->loadResult() === 0)
-				{
-					$missing[] = htmlspecialchars($type . ': ' . $id, ENT_QUOTES, 'UTF-8');
-				}
-			}
-
-			return $missing;
-		}
 		catch (\Throwable $e)
 		{
-			return [];
+			// Silent — avoid breaking install if update_sites query fails
-		}
-	}
-
-	private function getExistingDlid(): string
-	{
-		try
-		{
-			$db = Factory::getContainer()->get(DatabaseInterface::class);
-			$db->setQuery(
-				$db->getQuery(true)
-					->select($db->quoteName('extra_query'))
-					->from($db->quoteName('#__update_sites'))
-					->where($db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteNPO%'))
-					->setLimit(1)
-			);
-
-			$extraQuery = $db->loadResult() ?? '';
-
-			if (preg_match('/dlid=([a-zA-Z0-9]+)/', $extraQuery, $matches))
-			{
-				return $matches[1];
-			}
-		}
-		catch (\Throwable $e)
-		{
-			Log::add('NPO install: failed to read DLID — ' . $e->getMessage(), Log::WARNING, 'mokosuite.npo');
-		}
-
-		return '';
-	}
-
-	private function restoreDlid(string $dlid): void
-	{
-		try
-		{
-			$db = Factory::getContainer()->get(DatabaseInterface::class);
-			$db->setQuery(
-				$db->getQuery(true)
-					->update($db->quoteName('#__update_sites'))
-					->set($db->quoteName('extra_query') . ' = ' . $db->quote('dlid=' . $dlid))
-					->where($db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteNPO%'))
-			);
-			$db->execute();
-		}
-		catch (\Throwable $e)
-		{
-			Log::add('NPO install: failed to restore DLID — ' . $e->getMessage(), Log::WARNING, 'mokosuite.npo');
-		}
-	}
-
-	private function enablePlugin(string $group, string $element): void
-	{
-		try
-		{
-			$db = Factory::getContainer()->get(DatabaseInterface::class);
-			$db->setQuery(
-				$db->getQuery(true)
-					->update($db->quoteName('#__extensions'))
-					->set($db->quoteName('enabled') . ' = 1')
-					->where($db->quoteName('type') . ' = ' . $db->quote('plugin'))
-					->where($db->quoteName('folder') . ' = ' . $db->quote($group))
-					->where($db->quoteName('element') . ' = ' . $db->quote($element))
-			);
-			$db->execute();
-		}
-		catch (\Throwable $e)
-		{
-			Log::add('NPO install: failed to enable ' . $group . '/' . $element . ' — ' . $e->getMessage(), Log::WARNING, 'mokosuite.npo');
 		}
 	}
 }