feat: beforeunload warning during backup, placeholder-aware directory checks
Generic: Repo Health / Release configuration (push) Has been cancelled
Generic: Repo Health / Scripts governance (push) Has been cancelled
Generic: Repo Health / Repository health (push) Has been cancelled
Generic: Repo Health / Report Issues (push) Has been cancelled
Generic: Repo Health / Site Health (push) Has been cancelled
Generic: Repo Health / Access control (push) Has been cancelled
Universal: Auto Version Bump / Version Bump (push) Has been cancelled
Generic: Repo Health / Release configuration (push) Has been cancelled
Generic: Repo Health / Scripts governance (push) Has been cancelled
Generic: Repo Health / Repository health (push) Has been cancelled
Generic: Repo Health / Report Issues (push) Has been cancelled
Generic: Repo Health / Site Health (push) Has been cancelled
Generic: Repo Health / Access control (push) Has been cancelled
Universal: Auto Version Bump / Version Bump (push) Has been cancelled
- Browser warns before closing/navigating while backup is in progress - FolderPickerField shows info status for paths with [placeholders] instead of "Directory not found" - Dashboard health check skips filesystem check when backup_dir uses placeholders (resolved at backup time by PlaceholderResolver) Authored-by: Moko Consulting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -49,6 +49,11 @@ class Pkg_MokoJoomBackupInstallerScript
|
||||
return false;
|
||||
}
|
||||
|
||||
// Save download key before Joomla re-registers the update site
|
||||
if ($type === 'update') {
|
||||
$this->preflight_saveKey();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -60,8 +65,53 @@ class Pkg_MokoJoomBackupInstallerScript
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
/**
|
||||
* Called before install/update to preserve the download key.
|
||||
*
|
||||
* Joomla re-registers update sites from the manifest on every update,
|
||||
* which can reset the extra_query (download key). We save it here
|
||||
* and restore it in postflight.
|
||||
*/
|
||||
private ?string $savedDownloadKey = null;
|
||||
|
||||
public function preflight_saveKey(): void
|
||||
{
|
||||
try {
|
||||
$db = Factory::getDbo();
|
||||
$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 ' . $db->quoteName('use.update_site_id') . ' = ' . $db->quoteName('us.update_site_id')
|
||||
)
|
||||
->join(
|
||||
'INNER',
|
||||
$db->quoteName('#__extensions', 'e')
|
||||
. ' ON ' . $db->quoteName('e.extension_id') . ' = ' . $db->quoteName('use.extension_id')
|
||||
)
|
||||
->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokojoombackup'))
|
||||
->where($db->quoteName('e.type') . ' = ' . $db->quote('package'))
|
||||
->setLimit(1);
|
||||
$db->setQuery($query);
|
||||
$key = $db->loadResult();
|
||||
|
||||
if (!empty($key)) {
|
||||
$this->savedDownloadKey = $key;
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
// Not critical
|
||||
}
|
||||
}
|
||||
|
||||
public function postflight(string $type, InstallerAdapter $parent): void
|
||||
{
|
||||
// Restore download key if it was saved before update
|
||||
if ($this->savedDownloadKey !== null) {
|
||||
$this->restoreDownloadKey();
|
||||
}
|
||||
|
||||
if ($type === 'install') {
|
||||
// Enable the system plugin automatically on fresh install
|
||||
$db = Factory::getDbo();
|
||||
@@ -157,6 +207,45 @@ class Pkg_MokoJoomBackupInstallerScript
|
||||
$this->showUpdateSiteNotice();
|
||||
}
|
||||
|
||||
/**
|
||||
* Restore the download key to the (possibly new) update site record.
|
||||
*/
|
||||
private function restoreDownloadKey(): void
|
||||
{
|
||||
try {
|
||||
$db = Factory::getDbo();
|
||||
$query = $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 ' . $db->quoteName('use.update_site_id') . ' = ' . $db->quoteName('us.update_site_id')
|
||||
)
|
||||
->join(
|
||||
'INNER',
|
||||
$db->quoteName('#__extensions', 'e')
|
||||
. ' ON ' . $db->quoteName('e.extension_id') . ' = ' . $db->quoteName('use.extension_id')
|
||||
)
|
||||
->where($db->quoteName('e.element') . ' = ' . $db->quote('pkg_mokojoombackup'))
|
||||
->where($db->quoteName('e.type') . ' = ' . $db->quote('package'))
|
||||
->setLimit(1);
|
||||
$db->setQuery($query);
|
||||
$updateSiteId = (int) $db->loadResult();
|
||||
|
||||
if ($updateSiteId > 0) {
|
||||
$query = $db->getQuery(true)
|
||||
->update($db->quoteName('#__update_sites'))
|
||||
->set($db->quoteName('extra_query') . ' = ' . $db->quote($this->savedDownloadKey))
|
||||
->where($db->quoteName('update_site_id') . ' = ' . $updateSiteId);
|
||||
$db->setQuery($query);
|
||||
$db->execute();
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
// Not critical
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Show an info message linking directly to the update site record
|
||||
* so the user can configure their download key.
|
||||
|
||||
Reference in New Issue
Block a user