Compare commits
6 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d38934c475 | |||
| 3396766c02 | |||
| 3f5dccc1dc | |||
| 7837d74e76 | |||
| 69af5839b9 | |||
| 1eee4207fc |
@@ -1,33 +0,0 @@
|
||||
name: Build Package
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
with:
|
||||
submodules: recursive
|
||||
|
||||
- name: Build package ZIP
|
||||
run: |
|
||||
cd source
|
||||
# Create individual package ZIPs
|
||||
for pkg_dir in packages/*/; do
|
||||
pkg_name=$(basename "$pkg_dir")
|
||||
cd "$pkg_dir"
|
||||
zip -r "../../${pkg_name}.zip" . -x "*.git*"
|
||||
cd ../..
|
||||
done
|
||||
# Create main package ZIP with all sub-packages + manifest
|
||||
zip -j "pkg_mokosuitenpo.zip" pkg_*.xml script.php updates.xml *.zip 2>/dev/null || true
|
||||
ls -la *.zip
|
||||
|
||||
- name: Create Release
|
||||
uses: softprops/action-gh-release@v1
|
||||
with:
|
||||
files: source/pkg_mokosuitenpo.zip
|
||||
generate_release_notes: true
|
||||
@@ -0,0 +1,66 @@
|
||||
name: Pre-Release Package
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- "v*"
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
version:
|
||||
description: "Version (e.g. 1.0.0-alpha.1)"
|
||||
required: true
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
|
||||
- name: Determine version
|
||||
id: version
|
||||
run: |
|
||||
if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
|
||||
echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
|
||||
echo "TAG=v${{ github.event.inputs.version }}" >> $GITHUB_OUTPUT
|
||||
else
|
||||
VERSION="${GITHUB_REF#refs/tags/v}"
|
||||
echo "VERSION=$VERSION" >> $GITHUB_OUTPUT
|
||||
echo "TAG=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
|
||||
fi
|
||||
|
||||
- name: Build package zip
|
||||
run: |
|
||||
cd source
|
||||
for dir in packages/*/; do
|
||||
pkg_name=$(basename "$dir")
|
||||
cd "$dir"
|
||||
zip -r "../../${pkg_name}.zip" . -x "*.git*"
|
||||
cd ../..
|
||||
done
|
||||
mkdir -p pkg_build
|
||||
mv *.zip pkg_build/
|
||||
cp pkg_*.xml pkg_build/ 2>/dev/null || true
|
||||
cp script.php pkg_build/ 2>/dev/null || true
|
||||
cd pkg_build
|
||||
zip -r "../${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip" .
|
||||
|
||||
- name: Create Pre-Release
|
||||
uses: actions/create-release@v1
|
||||
id: create_release
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
tag_name: ${{ steps.version.outputs.TAG }}
|
||||
release_name: "${{ github.event.repository.name }} ${{ steps.version.outputs.TAG }}"
|
||||
draft: false
|
||||
prerelease: true
|
||||
|
||||
- name: Upload Release Asset
|
||||
uses: actions/upload-release-asset@v1
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
with:
|
||||
upload_url: ${{ steps.create_release.outputs.upload_url }}
|
||||
asset_path: ./source/${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip
|
||||
asset_name: ${{ github.event.repository.name }}-${{ steps.version.outputs.VERSION }}.zip
|
||||
asset_content_type: application/zip
|
||||
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 01.07.29
|
||||
# VERSION: 01.07.28
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<license>GPL-3.0-or-later</license>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
<authorUrl>https://mokoconsulting.tech</authorUrl>
|
||||
<version>01.07.29</version>
|
||||
<version>01.07.28</version>
|
||||
<php_minimum>8.3</php_minimum>
|
||||
<description>MokoSuite NPO component</description>
|
||||
<namespace path="src">Moko\Component\MokoSuiteNpo</namespace>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<extension type="package" method="upgrade">
|
||||
<name>Package - MokoSuite NPO</name>
|
||||
<packagename>mokosuitenpo</packagename>
|
||||
<version>01.07.29</version>
|
||||
<version>01.07.28</version>
|
||||
<creationDate>2026-06-11</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
@@ -23,6 +23,6 @@
|
||||
</files>
|
||||
|
||||
<updateservers>
|
||||
<server type="extension" name="MokoSuiteNPO Updates">https://git.mokoconsulting.tech/api/packages/MokoConsulting/generic/MokoSuiteNPO/updates.xml</server>
|
||||
<server type="extension" name="MokoSuiteNPO Updates">https://git.mokoconsulting.tech/api/packages/MokoConsulting/generic/MokoSuiteNPO/latest/updates.xml</server>
|
||||
</updateservers>
|
||||
</extension>
|
||||
|
||||
+181
-36
@@ -1,9 +1,10 @@
|
||||
<?php
|
||||
/**
|
||||
* @package MokoSuiteNPO
|
||||
* @subpackage pkg_mokosuitenpo
|
||||
* MokoSuite NPO Package Install Script
|
||||
*
|
||||
* @package MokoSuite NPO
|
||||
* @copyright Copyright (C) 2026 Moko Consulting. All rights reserved.
|
||||
* @license GNU General Public License version 3 or later; see LICENSE
|
||||
* @license GPL-3.0-or-later
|
||||
*/
|
||||
|
||||
defined('_JEXEC') or die;
|
||||
@@ -11,50 +12,73 @@ 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
|
||||
{
|
||||
public function postflight(string $type, InstallerAdapter $adapter): void
|
||||
private string $savedDlid = '';
|
||||
|
||||
public function preflight(string $type, InstallerAdapter $adapter): bool
|
||||
{
|
||||
$this->warnMissingLicenseKey();
|
||||
if ($type === 'update')
|
||||
{
|
||||
$this->savedDlid = $this->getExistingDlid();
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
private function warnMissingLicenseKey(): void
|
||||
public function postflight(string $type, InstallerAdapter $adapter): void
|
||||
{
|
||||
try
|
||||
if ($this->savedDlid)
|
||||
{
|
||||
$this->restoreDlid($this->savedDlid);
|
||||
}
|
||||
|
||||
if ($type === 'install')
|
||||
{
|
||||
$missing = $this->verifyChildren($adapter);
|
||||
|
||||
if (!empty($missing))
|
||||
{
|
||||
Factory::getApplication()->enqueueMessage(
|
||||
'<strong>MokoSuite NPO — Incomplete Installation</strong><br>'
|
||||
. 'The following extensions failed to install: '
|
||||
. implode(', ', $missing)
|
||||
. '.<br>Please check file permissions and server logs, then reinstall the package.',
|
||||
'error'
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
$this->enablePlugin('system', 'mokosuitenpo');
|
||||
$this->enablePlugin('webservices', 'mokosuitenpo');
|
||||
$this->enablePlugin('task', 'mokosuitenpo_task');
|
||||
}
|
||||
|
||||
$dlid = $this->getExistingDlid();
|
||||
|
||||
if (empty($dlid))
|
||||
{
|
||||
$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)
|
||||
try
|
||||
{
|
||||
$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;
|
||||
$db = Factory::getContainer()->get(DatabaseInterface::class);
|
||||
$db->setQuery(
|
||||
$db->getQuery(true)
|
||||
->select($db->quoteName('update_site_id'))
|
||||
->from($db->quoteName('#__update_sites'))
|
||||
->where($db->quoteName('name') . ' LIKE ' . $db->quote('%MokoSuiteNPO%'))
|
||||
->setLimit(1)
|
||||
);
|
||||
$siteId = (int) $db->loadResult();
|
||||
$editUrl = $siteId
|
||||
? 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . $siteId
|
||||
: 'index.php?option=com_installer&view=updatesites';
|
||||
}
|
||||
else
|
||||
catch (\Throwable $e)
|
||||
{
|
||||
$editUrl = 'index.php?option=com_installer&view=updatesites';
|
||||
}
|
||||
@@ -66,9 +90,130 @@ 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)
|
||||
{
|
||||
// Silent — avoid breaking install if update_sites query fails
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
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');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user