diff --git a/source/script.php b/source/script.php
index ad16609..6ab61ac 100644
--- a/source/script.php
+++ b/source/script.php
@@ -18,8 +18,8 @@ class Pkg_MokoJoomCrossInstallerScript
{
protected $minimumPhp = '8.1.0';
- /** @var array Download keys saved before Joomla wipes update sites */
- private array $savedDownloadKeys = [];
+
+
public function preflight(string $type, InstallerAdapter $parent): bool
{
@@ -33,14 +33,14 @@ class Pkg_MokoJoomCrossInstallerScript
return false;
}
- $this->savedDownloadKeys = $this->backupDownloadKeys();
+ $this->saveDownloadKey();
return true;
}
public function postflight(string $type, InstallerAdapter $parent): void
{
- $this->restoreDownloadKeys($this->savedDownloadKeys);
+ $this->restoreDownloadKey();
$this->warnMissingLicenseKey();
$db = Factory::getDbo();
@@ -78,151 +78,6 @@ class Pkg_MokoJoomCrossInstallerScript
}
}
- private function backupDownloadKeys(): array
- {
- $keys = [];
-
- try
- {
- $db = Factory::getDbo();
- $db->setQuery(
- $db->getQuery(true)
- ->select([
- 'us.' . $db->quoteName('update_site_id'),
- 'us.' . $db->quoteName('extra_query'),
- 'us.' . $db->quoteName('location'),
- 'e.' . $db->quoteName('element'),
- ])
- ->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('us.extra_query') . ' != ' . $db->quote(''))
- );
-
- foreach ($db->loadObjectList() ?: [] as $row)
- {
- $keys['elem_' . $row->element] = $row->extra_query;
- $keys[$row->location] = $row->extra_query;
- $keys['id_' . $row->update_site_id] = $row->extra_query;
- }
- }
- catch (\Throwable $e) {}
-
- return $keys;
- }
-
- private function restoreDownloadKeys(array $savedKeys): void
- {
- if (empty($savedKeys))
- {
- return;
- }
-
- try
- {
- $db = Factory::getDbo();
- $db->setQuery(
- $db->getQuery(true)
- ->select([
- 'us.' . $db->quoteName('update_site_id'),
- 'us.' . $db->quoteName('extra_query'),
- 'us.' . $db->quoteName('location'),
- 'e.' . $db->quoteName('element'),
- ])
- ->from($db->quoteName('#__update_sites', 'us'))
- ->join('LEFT', $db->quoteName('#__update_sites_extensions', 'use') . ' ON us.update_site_id = use.update_site_id')
- ->join('LEFT', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
- ->where('(' . $db->quoteName('us.extra_query') . ' = ' . $db->quote('')
- . ' OR ' . $db->quoteName('us.extra_query') . ' NOT LIKE ' . $db->quote('%dlid=%') . ')')
- );
-
- $restored = 0;
-
- foreach ($db->loadObjectList() ?: [] as $site)
- {
- $element = (string) ($site->element ?? '');
- $key = '';
-
- if ($element !== '')
- {
- $key = $savedKeys['elem_' . $element] ?? '';
- }
-
- if (empty($key))
- {
- $key = $savedKeys[$site->location] ?? $savedKeys['id_' . $site->update_site_id] ?? '';
- }
-
- if (!empty($key))
- {
- $db->setQuery(
- $db->getQuery(true)
- ->update($db->quoteName('#__update_sites'))
- ->set($db->quoteName('extra_query') . ' = ' . $db->quote($key))
- ->where($db->quoteName('update_site_id') . ' = ' . (int) $site->update_site_id)
- )->execute();
- $restored++;
- }
- }
-
- if ($restored > 0)
- {
- Factory::getApplication()->enqueueMessage(
- sprintf('Restored %d download key(s) after update site cleanup.', $restored),
- 'message'
- );
- }
- }
- catch (\Throwable $e) {}
- }
-
- 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('%MokoJoomCross%')
- . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoJoomCross%') . ')')
- ->setLimit(1);
- $db->setQuery($query);
- $site = $db->loadObject();
-
- if ($site)
- {
- $extraQuery = (string) ($site->extra_query ?? '');
-
- if (!empty($extraQuery) && strpos($extraQuery, 'dlid=') !== false)
- {
- parse_str($extraQuery, $parsed);
-
- if (!empty($parsed['dlid']))
- {
- return;
- }
- }
-
- $editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
- }
- else
- {
- $editUrl = 'index.php?option=com_installer&view=updatesites';
- }
-
- $app->enqueueMessage(
- 'Moko Consulting License Key Required — '
- . 'No download key is configured. Updates will not be available until a valid license key is entered. '
- . 'Enter License Key',
- 'warning'
- );
- }
- catch (\Throwable $e) {}
- }
-
private function detectPerfectPublisherPro($db): void
{
$query = $db->getQuery(true)
@@ -252,4 +107,91 @@ class Pkg_MokoJoomCrossInstallerScript
$db->execute();
}
}
+
+ private ?string $savedDownloadKey = null;
+
+ private function saveDownloadKey(): void
+ {
+ try
+ {
+ $db = \Joomla\CMS\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_mokojoomcross'))
+ ->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 = \Joomla\CMS\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_mokojoomcross'))
+ ->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) {}
+ }
+
+ private function warnMissingLicenseKey(): void
+ {
+ try
+ {
+ $db = \Joomla\CMS\Factory::getDbo();
+ $db->setQuery(
+ $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('%MokoJoomCross%') . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoJoomCross%') . ')')
+ ->setLimit(1)
+ );
+ $site = $db->loadObject();
+
+ if ($site)
+ {
+ $eq = (string) ($site->extra_query ?? '');
+ if (!empty($eq) && strpos($eq, 'dlid=') !== false) { parse_str($eq, $p); if (!empty($p['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';
+ }
+
+ \Joomla\CMS\Factory::getApplication()->enqueueMessage(
+ 'Moko Consulting License Key Required — '
+ . 'No download key is configured. Updates will not be available until a valid license key is entered. '
+ . 'Enter License Key',
+ 'warning'
+ );
+ }
+ catch (\Throwable $e) {}
+ }
}