Compare commits

..

1 Commits

Author SHA1 Message Date
mokogitea-actions[bot] 5ec8dd257d chore(version): pre-release bump to 01.13.05-dev [skip ci] 2026-07-05 22:59:34 +00:00
93 changed files with 170 additions and 395 deletions
+4 -4
View File
@@ -7,7 +7,7 @@ Cross-posting Joomla content to social media, email marketing, and chat platform
| Field | Value |
|---|---|
| **Package** | `pkg_mokosuitecross` |
| **Language** | PHP 8.3+ |
| **Language** | PHP 8.1+ |
| **Branch** | develop on `dev`, merge to `main` (protected) |
| **Wiki** | [MokoSuiteCross Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteCross/wiki) |
@@ -28,7 +28,7 @@ Joomla **package** with core extensions + pluggable service plugins:
### com_mokosuitecross (Component)
- Admin backend: dashboard, services, post queue, templates, logs
- Joomla 6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
- Joomla 5/6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
- Namespace: `Joomla\Component\MokoSuiteCross\Administrator`
### plg_system_mokosuitecross (System Plugin)
@@ -73,8 +73,8 @@ Each platform is a separate plugin implementing `MokoSuiteCrossServiceInterface`
## Coding Standards
- PHP 8.3+ minimum
- Joomla 6 DI container pattern: `services/provider.php` → Extension class
- PHP 8.1+ minimum
- Joomla 5/6 DI container pattern: `services/provider.php` → Extension class
- Legacy stub `.php` file required for plugin loader but empty
- `SubscriberInterface` for event subscription (not `on*` method naming)
- `bind() → check() → store()` for Table operations (not `save()`)
+1 -1
View File
@@ -382,7 +382,7 @@ jobs:
content = open('CHANGELOG.md').read()
old = '## [Unreleased]'
new = f'## [Unreleased]\n\n## [{version}] --- {date}'
content = content if ('## [' + version + ']') in content else content.replace(old, new, 1)
content = content.replace(old, new, 1)
open('CHANGELOG.md', 'w').write(content)
" "$VERSION" "$DATE"
git add CHANGELOG.md
+4 -5
View File
@@ -131,11 +131,10 @@ jobs:
test:
name: Tests
runs-on: ubuntu-latest
# Independent job (no `needs: lint`): the Gitea Actions scheduler does not
# offer the dependent 2nd job of a needs-chain to runners, so it stalls in
# "waiting" and is reaped by ABANDONED_JOB_TIMEOUT. Guard template repos
# directly (same condition lint uses) instead of gating on lint's result.
if: ${{ !startsWith(github.event.repository.name, 'Template-') }}
needs: lint
# Run only when lint succeeded; always() forces evaluation so a skipped
# lint (e.g. template repos) skips this job cleanly instead of hanging.
if: ${{ always() && needs.lint.result == 'success' }}
steps:
- name: Checkout
+1 -1
View File
@@ -5,7 +5,7 @@
# FILE INFORMATION
# DEFGROUP: MokoGitea.Workflow
# INGROUP: mokocli.Automation
# VERSION: 01.14.00
# VERSION: 01.13.05
# BRIEF: Auto-create feature branch when an issue is opened
name: "Universal: Issue Branch"
+4 -4
View File
@@ -46,13 +46,13 @@ jobs:
WORKFLOW="${{ github.event.workflow_run.name }}"
URL="${{ github.event.workflow_run.html_url }}"
curl -sS --retry 3 --retry-connrefused --retry-delay 2 --max-time 20 \
curl -sS \
-H "Title: ${REPO} released" \
-H "Tags: white_check_mark,package" \
-H "Priority: default" \
-H "Click: ${URL}" \
-d "${WORKFLOW} completed successfully." \
"${NTFY_URL}/${NTFY_TOPIC}" || echo "::warning::ntfy notification could not be delivered (non-fatal)"
"${NTFY_URL}/${NTFY_TOPIC}"
- name: Notify on failure
if: github.event.workflow_run.conclusion == 'failure'
@@ -61,10 +61,10 @@ jobs:
WORKFLOW="${{ github.event.workflow_run.name }}"
URL="${{ github.event.workflow_run.html_url }}"
curl -sS --retry 3 --retry-connrefused --retry-delay 2 --max-time 20 \
curl -sS \
-H "Title: ${REPO} workflow failed" \
-H "Tags: x,warning" \
-H "Priority: high" \
-H "Click: ${URL}" \
-d "${WORKFLOW} failed. Check the run for details." \
"${NTFY_URL}/${NTFY_TOPIC}" || echo "::warning::ntfy notification could not be delivered (non-fatal)"
"${NTFY_URL}/${NTFY_TOPIC}"
+3 -4
View File
@@ -210,7 +210,7 @@ jobs:
- name: Check for merge conflict markers
run: |
CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --exclude-dir='.git' --exclude-dir='.mokogitea' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
if [ -n "$CONFLICTS" ]; then
echo "::error::Merge conflict markers found in source files"
echo "## Conflict Markers Found" >> $GITHUB_STEP_SUMMARY
@@ -258,9 +258,8 @@ jobs:
while IFS= read -r -d '' file; do
# Skip vendor, node_modules, and index.html stub files
case "$file" in ./vendor/*|./node_modules/*) continue ;; esac
# Scan the whole file for the JEXEC/JPATH guard: it is placed after
# the SPDX/file-header docblock, which commonly runs past 20 lines.
if ! grep -qE "defined\s*\(\s*['\"](_JEXEC|JPATH_BASE|\\\\JPATH_PLATFORM)['\"]" "$file"; then
# Check first 10 lines for JEXEC or JPATH guard
if ! head -20 "$file" | grep -qE "defined\s*\(\s*['\"](_JEXEC|JPATH_BASE|\\\\JPATH_PLATFORM)['\"]"; then
echo "::error file=${file}::Missing JEXEC guard: ${file}"
ERRORS=$((ERRORS + 1))
fi
+3 -9
View File
@@ -7,7 +7,7 @@
# INGROUP: mokocli.Release
# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
# PATH: /.mokogitea/workflows/pre-release.yml
# VERSION: 05.02.01
# VERSION: 05.02.00
# BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
name: "Universal: Pre-Release"
@@ -162,13 +162,7 @@ jobs:
git add -A
git diff --cached --quiet || {
git commit -m "chore(version): pre-release bump to ${VERSION} [skip ci]"
# Push the bump commit, but do NOT fail the release if the target branch
# is protected and the release identity is not on the push allowlist.
# The build proceeds from the in-tree bumped version regardless; if the
# push is rejected, the next run simply re-bumps from the same base.
if ! git push origin HEAD 2>&1; then
echo "::warning::Version-bump commit could not be pushed (protected branch?). Building from in-tree version ${VERSION} anyway."
fi
git push origin HEAD 2>&1
}
# Auto-detect element via manifest_element.php
@@ -280,4 +274,4 @@ jobs:
echo "| Version | \`${VERSION}\` |" >> $GITHUB_STEP_SUMMARY
echo "| Channel | ${STABILITY} |" >> $GITHUB_STEP_SUMMARY
echo "| Package | \`${ZIP_NAME}\` |" >> $GITHUB_STEP_SUMMARY
echo "| SHA-256 | \`${SHA256:-n/a}\` |" >> $GITHUB_STEP_SUMMARY
echo "| SHA-256 | \`${SHA256:-n/a}\` |" >> $GITHUB_STEP_SUMMARY
+13 -5
View File
@@ -1,11 +1,6 @@
# Changelog
## [Unreleased]
## [01.14.00] --- 2026-07-13
### Added
- **Admin menu short-name constant** — the Administrator → Components menu now shows a compact label via `COM_MOKOSUITECROSS_SHORT` ("Cross"); defined in the admin sys.ini (#255)
## [01.13.00] --- 2026-06-29
## [01.13.00] --- 2026-06-29
@@ -59,3 +54,16 @@
- **Content plugin**: Remove Joomla 5 typed event hints -- Joomla 6 dispatches `Model\AfterSaveEvent` instead of `Content\AfterSaveEvent`, causing fatal TypeError on article save
- **PreviewController**: Add ACL check and parameterized query to prevent unauthorized article access (IDOR)
- Webservices plugin Joomla 6 compatibility -- `onBeforeApiRoute` receives `BeforeApiRouteEvent` object, extract router via `$event->getRouter()`
## [01.07.00] --- 2026-06-23
## [01.07.00] --- 2026-06-23
### Added
- **Full ACL system**: 12 granular permissions in access.xml with permissions fieldset in config.xml
- **ACL enforcement**: All controllers and views check permissions before allowing actions
- **MokoSuiteCrossHelper::getActions()**: Centralized ACL helper for toolbar and view logic
### Fixed
- **License warning**: Removed duplicate from system plugin (install script already shows it)
- **Content plugin**: Fixed func_get_arg crash when non-article content is saved (e.g. update sites, installer)
+3 -3
View File
@@ -36,7 +36,7 @@ This is a Joomla **package** extension (`pkg_mokosuitecross`) containing sub-ext
### com_mokosuitecross (Component)
- Admin backend for managing services, post queue, templates, and logs
- Joomla 6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
- Joomla 5/6 MVC: Dashboard, Services, Posts, Logs (list/edit each)
- Namespace: `Joomla\Component\MokoSuiteCross\Administrator`
- Database tables: `#__mokosuitecross_services`, `#__mokosuitecross_posts`, `#__mokosuitecross_templates`, `#__mokosuitecross_logs`
@@ -102,8 +102,8 @@ Four tables:
## Coding Standards
- PHP 8.3+ minimum
- Joomla 6 DI container pattern: `services/provider.php` → Extension class
- PHP 8.1+ minimum
- Joomla 5/6 DI container pattern: `services/provider.php` → Extension class
- Legacy stub `.php` file required for plugin loader but empty
- `SubscriberInterface` for event subscription (not `on*` method naming)
- `bind() → check() → store()` for Table operations (not `save()`)
+1 -1
View File
@@ -14,7 +14,7 @@
DEFGROUP: Template-Joomla
INGROUP: Template-Joomla.Documentation
REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
VERSION: 01.14.00
VERSION: 01.13.05
PATH: ./CODE_OF_CONDUCT.md
BRIEF: Community expectations and enforcement guidelines
NOTE: Adapted with attribution from the Contributor Covenant v2.1
+1 -1
View File
@@ -19,7 +19,7 @@
DEFGROUP: mokoconsulting-tech.Template-Joomla
INGROUP: MokoStandards.Governance
REPO: https://github.com/mokoconsulting-tech/Template-Joomla
VERSION: 01.14.00
VERSION: 01.13.05
PATH: /GOVERNANCE.md
BRIEF: Project governance rules, roles, and decision process for Template-Joomla
-->
+1 -1
View File
@@ -1,6 +1,6 @@
# MokoSuiteCross
<!-- VERSION: 01.14.00 -->
<!-- VERSION: 01.13.05 -->
Cross-posting Joomla content to social media, email marketing, and chat platforms for Joomla 6.
+1 -1
View File
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
INGROUP: Template-Joomla.Documentation
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
PATH: /SECURITY.md
VERSION: 01.14.00
VERSION: 01.13.05
BRIEF: Security vulnerability reporting and handling policy
-->
+1 -1
View File
@@ -12,7 +12,7 @@
}
],
"require": {
"php": ">=8.3"
"php": ">=8.1"
},
"require-dev": {
"phpunit/phpunit": "^10.5",
@@ -3,7 +3,6 @@
; License: GPL-3.0-or-later
COM_MOKOSUITECROSS="MokoSuiteCross"
COM_MOKOSUITECROSS_SHORT="Cross"
COM_MOKOSUITECROSS_DESCRIPTION="Cross-posting Joomla content to social media, email marketing, and chat platforms"
COM_MOKOSUITECROSS_SUBMENU_DASHBOARD="Dashboard"
COM_MOKOSUITECROSS_SUBMENU_POSTS="Post Queue"
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="component" method="upgrade">
<name>com_mokosuitecross</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -43,7 +43,7 @@
</languages>
<administration>
<menu img="class:share-alt">COM_MOKOSUITECROSS_SHORT</menu>
<menu img="class:share-alt">COM_MOKOSUITECROSS</menu>
<submenu>
<menu link="option=com_mokosuitecross&amp;view=dashboard">COM_MOKOSUITECROSS_SUBMENU_DASHBOARD</menu>
<menu link="option=com_mokosuitecross&amp;view=posts">COM_MOKOSUITECROSS_SUBMENU_POSTS</menu>
@@ -11,7 +11,6 @@
defined('_JEXEC') or die;
use Joomla\CMS\Factory;
use Joomla\CMS\Installer\InstallerAdapter;
class Com_MokoSuiteCrossInstallerScript
@@ -23,77 +22,5 @@ class Com_MokoSuiteCrossInstallerScript
public function postflight(string $type, InstallerAdapter $parent): void
{
if ($type !== 'install') {
return;
}
// Be smart: verify EVERY table the component's own install SQL declares is
// actually present. If any are missing the install did not complete — say
// so instead of implying "installed successfully".
$missing = $this->missingTables();
if ($missing !== []) {
$detail = count($missing) > 6
? count($missing) . ' expected database tables are missing'
: 'missing tables: ' . htmlspecialchars(implode(', ', $missing), ENT_QUOTES, 'UTF-8');
Factory::getApplication()->enqueueMessage(
'<strong>MokoSuiteCross did not install correctly.</strong> ' . $detail
. ' — review the errors above, then reinstall.',
'error'
);
return;
}
// Success path: schema installed correctly.
Factory::getApplication()->enqueueMessage(
'<h4>MokoSuiteCross installed successfully!</h4>'
. '<p>To enable automatic updates, enter your license key in the '
. '<a href="index.php?option=com_config&view=component&component=com_mokosuitecross">component configuration</a>.</p>',
'info'
);
}
/**
* Smart schema check: parse the component's own installed install SQL for every
* CREATE TABLE, then return the ones missing from the database. An empty array
* means the full schema installed. Fails open (returns []) if the SQL can't be
* read, so a good install is never flagged as failed.
*
* @return string[] Names (without the #__ prefix) of missing tables.
*/
private function missingTables(): array
{
try {
$sqlFile = JPATH_ADMINISTRATOR . '/components/com_mokosuitecross/sql/install.mysql.sql';
if (!is_file($sqlFile)) {
return [];
}
$sql = file_get_contents($sqlFile);
if ($sql === false
|| !preg_match_all('/CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?[`"\']?(#__[A-Za-z0-9_]+)/i', $sql, $m)) {
return [];
}
$db = Factory::getDbo();
$prefix = strtolower($db->getPrefix());
$have = array_map('strtolower', $db->getTableList());
$missing = [];
foreach (array_unique($m[1]) as $decl) {
$bare = substr($decl, 3); // strip "#__"
if (!in_array($prefix . strtolower($bare), $have, true)) {
$missing[] = $bare;
}
}
return $missing;
} catch (\Throwable $e) {
return [];
}
}
}
@@ -1,7 +1,5 @@
-- MokoSuiteCross -- Uninstall
-- MokoSuiteCross Uninstall
DROP TABLE IF EXISTS `#__mokosuitecross_logs`;
DROP TABLE IF EXISTS `#__mokosuitecross_analytics`;
DROP TABLE IF EXISTS `#__mokosuitecross_category_rules`;
DROP TABLE IF EXISTS `#__mokosuitecross_posts`;
DROP TABLE IF EXISTS `#__mokosuitecross_templates`;
DROP TABLE IF EXISTS `#__mokosuitecross_services`;
@@ -1 +0,0 @@
/* 01.13.01 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.02 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.03 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.04 — no schema changes */
@@ -0,0 +1 @@
/* 01.13.05 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.06 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.08 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.09 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.10 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.11 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.12 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.13 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.14 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.15 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.16 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.17 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.18 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.19 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.20 — no schema changes */
@@ -1 +0,0 @@
/* 01.13.21 — no schema changes */
@@ -1 +0,0 @@
/* 01.14.00 — no schema changes */
@@ -130,10 +130,6 @@ class PostsController extends AdminController
{
$this->checkToken();
if (!$this->app->getIdentity()->authorise('mokosuitecross.queue.manage', 'com_mokosuitecross')) {
throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
}
$db = Factory::getDbo();
$query = $db->getQuery(true)
@@ -242,10 +238,6 @@ class PostsController extends AdminController
{
$this->checkToken();
if (!$this->app->getIdentity()->authorise('mokosuitecross.queue.manage', 'com_mokosuitecross')) {
throw new \RuntimeException(Text::_('JLIB_APPLICATION_ERROR_ACCESS_FORBIDDEN'), 403);
}
$db = Factory::getDbo();
$query = $db->getQuery(true)
@@ -19,6 +19,13 @@ class AnalyticsHelper
{
/**
* Record or update engagement metrics for a post.
*
* @param int $postId The post ID
* @param int $serviceId The service ID
* @param string $serviceType The service type (e.g. twitter, facebook)
* @param array $metrics Engagement metrics: impressions, engagements, clicks, shares, posted_at
*
* @return bool True on success
*/
public static function recordEngagement(int $postId, int $serviceId, string $serviceType, array $metrics): bool
{
@@ -44,6 +51,7 @@ class AnalyticsHelper
? round(($engagements / $impressions) * 100, 2)
: 0.00;
// Check if a row already exists for this post
$query = $db->getQuery(true)
->select($db->quoteName('id'))
->from($db->quoteName('#__mokosuitecross_analytics'))
@@ -88,7 +96,12 @@ class AnalyticsHelper
}
/**
* Get heatmap data as a 7x24 grid derived from actual post success data.
* Get heatmap data as a 7x24 grid of average engagement rates.
*
* @param string $serviceType Optional service type filter
* @param int $days Number of days to look back (0 = all time)
*
* @return array 7x24 grid: [ day_of_week => [ hour_of_day => avg_engagement_rate ] ]
*/
public static function getHeatmapData(string $serviceType = '', int $days = 90): array
{
@@ -96,40 +109,30 @@ class AnalyticsHelper
$query = $db->getQuery(true)
->select([
'DAYOFWEEK(' . $db->quoteName('p.posted_at') . ') - 1 AS day_of_week',
'HOUR(' . $db->quoteName('p.posted_at') . ') AS hour_of_day',
$db->quoteName('day_of_week'),
$db->quoteName('hour_of_day'),
'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
'COUNT(*) AS post_count',
])
->from($db->quoteName('#__mokosuitecross_posts', 'p'))
->join('INNER', $db->quoteName('#__mokosuitecross_services', 's')
. ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
->where($db->quoteName('p.status') . ' = ' . $db->quote('posted'))
->where($db->quoteName('p.posted_at') . ' IS NOT NULL')
->group('day_of_week')
->group('hour_of_day')
->order('day_of_week ASC')
->order('hour_of_day ASC');
->from($db->quoteName('#__mokosuitecross_analytics'))
->group($db->quoteName('day_of_week'))
->group($db->quoteName('hour_of_day'))
->order($db->quoteName('day_of_week') . ' ASC')
->order($db->quoteName('hour_of_day') . ' ASC');
if ($serviceType !== '') {
$query->where($db->quoteName('s.service_type') . ' = ' . $db->quote($serviceType));
$query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
}
if ($days > 0) {
$cutoff = Factory::getDate('-' . $days . ' days')->toSql();
$query->where($db->quoteName('p.posted_at') . ' >= ' . $db->quote($cutoff));
$query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
}
$db->setQuery($query);
$rows = $db->loadObjectList();
$maxCount = 1;
foreach ($rows as $row) {
if ((int) $row->post_count > $maxCount) {
$maxCount = (int) $row->post_count;
}
}
// Build 7x24 grid initialised to zero
$grid = [];
for ($d = 0; $d < 7; $d++) {
@@ -139,10 +142,9 @@ class AnalyticsHelper
}
foreach ($rows as $row) {
$count = (int) $row->post_count;
$grid[(int) $row->day_of_week][(int) $row->hour_of_day] = [
'avg_rate' => round(($count / $maxCount) * 100, 2),
'post_count' => $count,
'avg_rate' => round((float) $row->avg_rate, 2),
'post_count' => (int) $row->post_count,
];
}
@@ -150,7 +152,12 @@ class AnalyticsHelper
}
/**
* Get the best times to post ranked by post success frequency.
* Get the best times to post ranked by average engagement rate.
*
* @param string $serviceType Optional service type filter
* @param int $limit Number of results to return
*
* @return array List of [day_of_week, hour_of_day, avg_rate, post_count]
*/
public static function getBestTimes(string $serviceType = '', int $limit = 5): array
{
@@ -158,22 +165,19 @@ class AnalyticsHelper
$query = $db->getQuery(true)
->select([
'DAYOFWEEK(' . $db->quoteName('p.posted_at') . ') - 1 AS day_of_week',
'HOUR(' . $db->quoteName('p.posted_at') . ') AS hour_of_day',
$db->quoteName('day_of_week'),
$db->quoteName('hour_of_day'),
'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_rate',
'COUNT(*) AS post_count',
])
->from($db->quoteName('#__mokosuitecross_posts', 'p'))
->join('INNER', $db->quoteName('#__mokosuitecross_services', 's')
. ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
->where($db->quoteName('p.status') . ' = ' . $db->quote('posted'))
->where($db->quoteName('p.posted_at') . ' IS NOT NULL')
->group('day_of_week')
->group('hour_of_day')
->from($db->quoteName('#__mokosuitecross_analytics'))
->group($db->quoteName('day_of_week'))
->group($db->quoteName('hour_of_day'))
->having('COUNT(*) >= 1')
->order('post_count DESC');
->order('avg_rate DESC');
if ($serviceType !== '') {
$query->where($db->quoteName('s.service_type') . ' = ' . $db->quote($serviceType));
$query->where($db->quoteName('service_type') . ' = ' . $db->quote($serviceType));
}
$db->setQuery($query, 0, $limit);
@@ -184,16 +188,16 @@ class AnalyticsHelper
$results = [];
foreach ($rows as $row) {
$hour = (int) $row['hour_of_day'];
$ampm = $hour < 12 ? 'AM' : 'PM';
$hour12 = $hour % 12 ?: 12;
$hour = (int) $row['hour_of_day'];
$ampm = $hour < 12 ? 'AM' : 'PM';
$hour12 = $hour % 12 ?: 12;
$results[] = [
'day_of_week' => (int) $row['day_of_week'],
'day_name' => $dayNames[(int) $row['day_of_week']],
'hour_of_day' => $hour,
'hour_label' => $hour12 . ':00 ' . $ampm,
'avg_rate' => round((float) $row['post_count'], 2),
'avg_rate' => round((float) $row['avg_rate'], 2),
'post_count' => (int) $row['post_count'],
];
}
@@ -202,7 +206,11 @@ class AnalyticsHelper
}
/**
* Get stats grouped by service type from actual post data.
* Get engagement stats grouped by service type.
*
* @param int $days Number of days to look back (0 = all time)
*
* @return array List of [service_type, total_posts, avg_engagement_rate, total_impressions, total_engagements]
*/
public static function getServiceBreakdown(int $days = 30): array
{
@@ -210,41 +218,35 @@ class AnalyticsHelper
$query = $db->getQuery(true)
->select([
$db->quoteName('s.service_type'),
$db->quoteName('service_type'),
'COUNT(*) AS total_posts',
'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' = ' . $db->quote('posted') . ' THEN 1 ELSE 0 END) AS total_succeeded',
'SUM(CASE WHEN ' . $db->quoteName('p.status') . ' IN ('
. $db->quote('failed') . ',' . $db->quote('permanently_failed')
. ') THEN 1 ELSE 0 END) AS total_failed',
'AVG(' . $db->quoteName('engagement_rate') . ') AS avg_engagement_rate',
'SUM(' . $db->quoteName('impressions') . ') AS total_impressions',
'SUM(' . $db->quoteName('engagements') . ') AS total_engagements',
'SUM(' . $db->quoteName('clicks') . ') AS total_clicks',
'SUM(' . $db->quoteName('shares') . ') AS total_shares',
])
->from($db->quoteName('#__mokosuitecross_posts', 'p'))
->join('INNER', $db->quoteName('#__mokosuitecross_services', 's')
. ' ON ' . $db->quoteName('s.id') . ' = ' . $db->quoteName('p.service_id'))
->group($db->quoteName('s.service_type'))
->order('total_posts DESC');
->from($db->quoteName('#__mokosuitecross_analytics'))
->group($db->quoteName('service_type'))
->order('avg_engagement_rate DESC');
if ($days > 0) {
$cutoff = Factory::getDate('-' . $days . ' days')->toSql();
$query->where($db->quoteName('p.created') . ' >= ' . $db->quote($cutoff));
$query->where($db->quoteName('posted_at') . ' >= ' . $db->quote($cutoff));
}
$db->setQuery($query);
$rows = $db->loadAssocList();
foreach ($rows as &$row) {
$total = (int) $row['total_posts'];
$succeeded = (int) $row['total_succeeded'];
$row['total_posts'] = $total;
$row['total_succeeded'] = $succeeded;
$row['total_failed'] = (int) $row['total_failed'];
$row['avg_engagement_rate'] = $total > 0 ? round(($succeeded / $total) * 100, 2) : 0;
$row['total_impressions'] = 0;
$row['total_engagements'] = 0;
$row['total_clicks'] = 0;
$row['total_shares'] = 0;
$row['avg_engagement_rate'] = round((float) $row['avg_engagement_rate'], 2);
$row['total_posts'] = (int) $row['total_posts'];
$row['total_impressions'] = (int) $row['total_impressions'];
$row['total_engagements'] = (int) $row['total_engagements'];
$row['total_clicks'] = (int) $row['total_clicks'];
$row['total_shares'] = (int) $row['total_shares'];
}
return $rows;
}
}
}
@@ -594,26 +594,13 @@ class CrossPostDispatcher
return;
}
// Load service plugins using Joomla 5/6-compatible dispatcher pattern
// Load service plugins
PluginHelper::importPlugin('mokosuitecross');
$servicePlugins = [];
$event = new \Joomla\Event\Event('onMokoSuiteCrossGetServices', [$servicePlugins]);
try {
Factory::getApplication()->getDispatcher()->dispatch('onMokoSuiteCrossGetServices', $event);
} catch (\Throwable $e) {
// Dispatcher may not be available
}
$idx = 1;
while (isset($event[$idx])) {
$servicePlugins[] = $event[$idx];
$idx++;
}
$plugins = [];
Factory::getApplication()->triggerEvent('onMokoSuiteCrossGetServices', [&$plugins]);
$pluginMap = [];
foreach ($servicePlugins as $plugin) {
foreach ($plugins as $plugin) {
$pluginMap[$plugin->getServiceType()] = $plugin;
}
@@ -626,7 +613,7 @@ class CrossPostDispatcher
continue;
}
$credentials = CredentialHelper::decrypt($post->credentials ?: '');
$credentials = json_decode($post->credentials, true) ?: [];
try {
$result = $plugin->deletePost($post->platform_post_id, $credentials);
@@ -41,8 +41,9 @@ class MokoSuiteCrossHelper
'services' => 'COM_MOKOSUITECROSS_SUBMENU_SERVICES',
'templates' => 'COM_MOKOSUITECROSS_SUBMENU_TEMPLATES',
'calendar' => 'COM_MOKOSUITECROSS_SUBMENU_CALENDAR',
'analytics' => 'COM_MOKOSUITECROSS_SUBMENU_ANALYTICS',
'logs' => 'COM_MOKOSUITECROSS_SUBMENU_LOGS',
'calendar' => 'COM_MOKOSUITECROSS_SUBMENU_CALENDAR',
'analytics' => 'COM_MOKOSUITECROSS_SUBMENU_ANALYTICS',
];
// Joomla 5+ toolbar submenu
@@ -91,16 +91,6 @@ class QueueProcessor
$db->setQuery($query);
$retryPosts = $db->loadObjectList() ?: [];
// 3. Recover stale "posting" entries (stuck > 10 minutes)
$staleQuery = $db->getQuery(true)
->update($db->quoteName('#__mokosuitecross_posts'))
->set($db->quoteName('status') . ' = ' . $db->quote('queued'))
->set($db->quoteName('modified') . ' = ' . $db->quote($now))
->where($db->quoteName('status') . ' = ' . $db->quote('posting'))
->where($db->quoteName('modified') . ' < DATE_SUB(NOW(), INTERVAL 600 SECOND)');
$db->setQuery($staleQuery);
$db->execute();
$allPosts = array_merge($queuedPosts, $retryPosts);
foreach ($allPosts as $post) {
@@ -22,7 +22,7 @@ use Joomla\Component\MokoSuiteCross\Administrator\Helper\MokoSuiteCrossHelper;
class HtmlView extends BaseHtmlView
{
public $sidebar;
public $ajaxUrl;
public function display($tpl = null): void
@@ -40,6 +40,7 @@ class HtmlView extends BaseHtmlView
$this->addToolbar();
MokoSuiteCrossHelper::addSubmenu('calendar');
$this->sidebar = \Joomla\CMS\HTML\Sidebar::render();
// Set document title
Factory::getApplication()->getDocument()->setTitle(
@@ -26,7 +26,7 @@ class HtmlView extends BaseHtmlView
protected $serviceBreakdown;
protected $dailyTrend;
protected $topArticles;
public $sidebar;
public $period;
public function display($tpl = null): void
@@ -58,6 +58,7 @@ class HtmlView extends BaseHtmlView
$this->addToolbar();
MokoSuiteCrossHelper::addSubmenu('dashboard');
$this->sidebar = \Joomla\CMS\HTML\Sidebar::render();
parent::display($tpl);
}
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="content" method="upgrade">
<name>Content - MokoSuiteCross</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -535,19 +535,6 @@ XML;
continue;
}
// Respect first-publish-only: skip if article was previously posted
if ($params->get('post_on_first_publish_only', 0)) {
$existsQuery = $db->getQuery(true)
->select('COUNT(*)')
->from($db->quoteName('#__mokosuitecross_posts'))
->where($db->quoteName('article_id') . ' = ' . (int) $pk);
$db->setQuery($existsQuery);
if ((int) $db->loadResult() > 0) {
continue;
}
}
$url = Uri::root() . 'index.php?option=com_content&view=article&id=' . $article->id;
if (!empty($article->catid)) {
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - ActivityPub (Fediverse)</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Google Blogger</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Bluesky</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Brevo (Sendinblue)</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Constant Contact</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - ConvertKit</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Dev.to</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Discord</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Facebook / Meta</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Ghost</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Google Business Profile</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Google Chat</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Hashnode</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Instagram</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-06-23</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - LinkedIn</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Mailchimp</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Mastodon</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Matrix / Element</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Medium</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - MokoSuiteCalendar Events</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - MokoSuiteGallery</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Nostr</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Ntfy Push Notifications</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Pinterest</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Reddit</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - RSS Feed</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - SendGrid</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Slack</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Microsoft Teams</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Telegram</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Threads (Meta)</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - TikTok</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Tumblr</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - X / Twitter</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Generic Webhook</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - WhatsApp Business</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - WordPress</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="mokosuitecross" method="upgrade">
<name>MokoSuiteCross - Youtube</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-06-23</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="system" method="upgrade">
<name>System - MokoSuiteCross</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="system" method="upgrade">
<name>System - MokoSuiteCross Events</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="system" method="upgrade">
<name>System - MokoSuiteCross Gallery</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="task" method="upgrade">
<name>Task - MokoSuiteCross Queue Processor</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<extension type="plugin" group="webservices" method="upgrade">
<name>Web Services - MokoSuiteCross</name>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
+2 -2
View File
@@ -2,7 +2,7 @@
<extension type="package" method="upgrade">
<name>MokoSuiteCross</name>
<packagename>mokosuitecross</packagename>
<version>01.14.00</version>
<version>01.13.05</version>
<creationDate>2026-05-28</creationDate>
<author>Moko Consulting</author>
<authorEmail>hello@mokoconsulting.tech</authorEmail>
@@ -76,6 +76,6 @@
<blockChildUninstall>true</blockChildUninstall>
<updateservers>
<server type="extension" name="MokoSuiteCross Updates">https://git.mokoconsulting.tech/api/packages/MokoConsulting/generic/MokoSuiteCross/latest/updates.xml</server>
<server type="extension" name="MokoSuiteCross Updates">https://git.mokoconsulting.tech/MokoConsulting/MokoSuiteCross/updates.xml</server>
</updateservers>
</extension>
+1 -92
View File
@@ -40,8 +40,8 @@ class Pkg_MokoSuiteCrossInstallerScript
public function postflight(string $type, InstallerAdapter $parent): void
{
// The download key must be restored regardless of the install outcome.
$this->restoreDownloadKey();
$this->warnMissingLicenseKey();
$db = Factory::getDbo();
@@ -76,97 +76,6 @@ class Pkg_MokoSuiteCrossInstallerScript
$this->detectPerfectPublisherPro($db);
}
// Be smart: only run the success path (and show the licence notice, which
// implies a completed install) when every child extension declared in the
// package manifest actually registered. If any are missing, the package
// did NOT install successfully — surface that instead of implying success.
$missing = $this->missingChildExtensions($parent);
if ($missing !== [])
{
Factory::getApplication()->enqueueMessage(
'<strong>MokoSuiteCross did not install completely.</strong> '
. 'The following extension(s) failed to install: '
. htmlspecialchars(implode(', ', $missing), ENT_QUOTES, 'UTF-8') . '. '
. 'Resolve the errors shown above, then uninstall and reinstall the package.',
'error'
);
return;
}
$this->warnMissingLicenseKey();
}
/**
* Compare the child extensions the package manifest declares against what is
* actually registered in #__extensions after the install/update. Returns the
* label of each declared extension that is missing (i.e. failed to install);
* an empty array means every child installed and the package succeeded.
*
* Fails open: any error returns [] so a query problem can never turn a good
* install into a false "did not install completely" warning.
*
* @param InstallerAdapter $parent
* @return string[]
*/
private function missingChildExtensions(InstallerAdapter $parent): array
{
$missing = [];
try
{
$manifest = $parent->getParent()->getManifest();
if (!$manifest || !isset($manifest->files) || !isset($manifest->files->file))
{
return [];
}
$db = Factory::getDbo();
foreach ($manifest->files->file as $file)
{
$type = (string) $file['type'];
$element = (string) $file['id'];
$group = (string) $file['group'];
if ($element === '')
{
continue;
}
$query = $db->getQuery(true)
->select('COUNT(*)')
->from($db->quoteName('#__extensions'))
->where($db->quoteName('element') . ' = ' . $db->quote($element));
if ($type !== '')
{
$query->where($db->quoteName('type') . ' = ' . $db->quote($type));
}
// Plugins are only unique by element + folder (the manifest "group").
if ($type === 'plugin' && $group !== '')
{
$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
}
$db->setQuery($query);
if ((int) $db->loadResult() === 0)
{
$missing[] = $element . ($group !== '' ? ' (' . $group . ')' : '');
}
}
}
catch (\Throwable $e)
{
return [];
}
return $missing;
}
private function detectPerfectPublisherPro($db): void