Revert "Merge branch 'dev' into main"

This reverts commit 65e6ae3fbc, reversing changes made to 15379bd386.
2026-07-10 16:26:10 -05:00
parent 65e6ae3fbc
commit 56ea7f4781
29 changed files with 569 additions and 2338 deletions
@@ -1,177 +1,8 @@
 <?php
-/**
- * @package     MokoSuiteNPO
- * @subpackage  pkg_mokosuitenpo
- * @copyright   Copyright (C) 2026 Moko Consulting. All rights reserved.
- * @license     GNU General Public License version 3 or later; see LICENSE
- */
-
 defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
 use Joomla\CMS\Installer\InstallerAdapter;
-use Joomla\CMS\Log\Log;
-
-/**
- * Package installation script for MokoSuiteNPO.
- */
-class Pkg_MokoSuiteNPOInstallerScript
+class Pkg_mokosuitenpoInstallerScript
 {
-	public function postflight(string $type, InstallerAdapter $adapter): void
-	{
-		// 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
-		// 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 (!empty($missing))
-		{
-			Factory::getApplication()->enqueueMessage(
-				'<h4>MokoSuiteNPO did not install correctly.</h4>'
-				. '<p>The following bundled extensions are missing: '
-				. htmlspecialchars(implode(', ', $missing), ENT_QUOTES) . '</p>'
-				. '<p>Please uninstall MokoSuiteNPO and reinstall the full package.</p>',
-				'error'
-			);
-
-			return;
-		}
-
-		$this->warnMissingLicenseKey();
-	}
-
-	/**
-	 * Verify every child extension declared in the package manifest actually
-	 * 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
-	{
-		try
-		{
-			$manifest = $adapter->getParent()->getManifest();
-
-			if (!$manifest || !isset($manifest->files) || !isset($manifest->files->file))
-			{
-				return [];
-			}
-
-			$db      = Factory::getDbo();
-			$missing = [];
-
-			foreach ($manifest->files->file as $file)
-			{
-				$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';
-			}
-
-			$app->enqueueMessage(
-				'<strong>Moko Consulting License Key Required</strong> — '
-				. 'No download key is configured. Updates will not be available until a valid license key is entered. '
-				. '<a href="' . $editUrl . '" class="btn btn-sm btn-warning ms-2">Enter License Key</a>',
-				'warning'
-			);
-		}
-		catch (\Throwable $e)
-		{
-			// Silent — avoid breaking install if update_sites query fails
-		}
-	}
+	public function preflight(string $type, InstallerAdapter $adapter): bool { return true; }
+	public function postflight(string $type, InstallerAdapter $adapter): void {}
 }