Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| cf744a8bd2 | |||
| dbaeb33dc4 | |||
| fe38a422be | |||
| a6fe8fb580 | |||
| a6a24f72de | |||
| 84b3d9dc2c | |||
| d6d93bddd9 | |||
| 3e6c8d685b | |||
| 236baed80d | |||
| fd28cb8a93 | |||
| cb0e5596ea | |||
| 7532446e46 |
@@ -5,7 +5,7 @@
|
||||
# FILE INFORMATION
|
||||
# DEFGROUP: Gitea.Workflow
|
||||
# INGROUP: mokocli.Automation
|
||||
# VERSION: 01.06.13
|
||||
# VERSION: 01.07.05
|
||||
# BRIEF: Auto-create feature branch when an issue is opened
|
||||
|
||||
name: "Universal: Issue Branch"
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ All notable changes to MokoSuiteOpenGraph will be documented in this file.
|
||||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
||||
|
||||
<!-- VERSION: 01.06.13 -->
|
||||
<!-- VERSION: 01.07.05 -->
|
||||
|
||||
## [Unreleased]
|
||||
|
||||
|
||||
+1
-1
@@ -14,7 +14,7 @@
|
||||
DEFGROUP: Template-Joomla
|
||||
INGROUP: Template-Joomla.Documentation
|
||||
REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
|
||||
VERSION: 01.06.13
|
||||
VERSION: 01.07.05
|
||||
PATH: ./CODE_OF_CONDUCT.md
|
||||
BRIEF: Community expectations and enforcement guidelines
|
||||
NOTE: Adapted with attribution from the Contributor Covenant v2.1
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@
|
||||
DEFGROUP: mokoconsulting-tech.Template-Joomla
|
||||
INGROUP: MokoStandards.Governance
|
||||
REPO: https://github.com/mokoconsulting-tech/Template-Joomla
|
||||
VERSION: 01.06.13
|
||||
VERSION: 01.07.05
|
||||
PATH: /GOVERNANCE.md
|
||||
BRIEF: Project governance rules, roles, and decision process for Template-Joomla
|
||||
-->
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# MokoSuiteOpenGraph
|
||||
|
||||
<!-- VERSION: 01.06.13 -->
|
||||
<!-- VERSION: 01.07.05 -->
|
||||
|
||||
Open Graph, Twitter Card, and social sharing meta tag management for Joomla 6 and higher.
|
||||
|
||||
|
||||
+1
-1
@@ -23,7 +23,7 @@ DEFGROUP: Template-Joomla
|
||||
INGROUP: Template-Joomla.Documentation
|
||||
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
|
||||
PATH: /SECURITY.md
|
||||
VERSION: 01.06.13
|
||||
VERSION: 01.07.05
|
||||
BRIEF: Security vulnerability reporting and handling policy
|
||||
-->
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="component" method="upgrade">
|
||||
<name>com_mokoog</name>
|
||||
<version>01.06.13</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -1,40 +1,119 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @package MokoSuiteOpenGraph
|
||||
* @subpackage com_mokoog
|
||||
* @author Moko Consulting <hello@mokoconsulting.tech>
|
||||
* @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\Installer\InstallerAdapter;
|
||||
|
||||
class Com_MokoOGInstallerScript
|
||||
{
|
||||
/**
|
||||
* Called after install.
|
||||
*
|
||||
* @param InstallerAdapter $parent Installer adapter
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function install(InstallerAdapter $parent): void
|
||||
{
|
||||
echo '<p>MokoSuiteOpenGraph component installed successfully.</p>';
|
||||
}
|
||||
|
||||
/**
|
||||
* Called after update.
|
||||
*
|
||||
* @param InstallerAdapter $parent Installer adapter
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function update(InstallerAdapter $parent): void
|
||||
{
|
||||
echo '<p>MokoSuiteOpenGraph component updated successfully.</p>';
|
||||
}
|
||||
}
|
||||
<?php
|
||||
|
||||
/**
|
||||
* @package MokoSuiteOpenGraph
|
||||
* @subpackage com_mokoog
|
||||
* @author Moko Consulting <hello@mokoconsulting.tech>
|
||||
* @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;
|
||||
|
||||
class Com_MokoOGInstallerScript
|
||||
{
|
||||
/**
|
||||
* Called after install.
|
||||
*
|
||||
* @param InstallerAdapter $parent Installer adapter
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function install(InstallerAdapter $parent): void
|
||||
{
|
||||
// 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 showing "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>MokoSuiteOpenGraph did not install correctly.</strong> ' . $detail
|
||||
. ' — review the errors above, then reinstall.',
|
||||
'error'
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Factory::getApplication()->enqueueMessage('<h4>MokoSuiteOpenGraph installed successfully!</h4>', 'info');
|
||||
}
|
||||
|
||||
/**
|
||||
* Called after update.
|
||||
*
|
||||
* @param InstallerAdapter $parent Installer adapter
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function update(InstallerAdapter $parent): void
|
||||
{
|
||||
// Same smart check on update: only report success if the schema is intact.
|
||||
$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>MokoSuiteOpenGraph did not update correctly.</strong> ' . $detail
|
||||
. ' — review the errors above.',
|
||||
'error'
|
||||
);
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
Factory::getApplication()->enqueueMessage('MokoSuiteOpenGraph updated successfully.', '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_mokoog/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 [];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
/* 01.07.01 — no schema changes */
|
||||
@@ -0,0 +1 @@
|
||||
/* 01.07.02 — no schema changes */
|
||||
@@ -0,0 +1 @@
|
||||
/* 01.07.03 — no schema changes */
|
||||
@@ -0,0 +1 @@
|
||||
/* 01.07.05 — no schema changes */
|
||||
@@ -73,7 +73,9 @@ class BatchController extends BaseController
|
||||
}
|
||||
|
||||
$app = Factory::getApplication();
|
||||
$limit = min($app->getInput()->getInt('limit', 50), 200);
|
||||
$input = $app->getInput();
|
||||
$limit = min($input->getInt('limit', 50), 200);
|
||||
$lastId = max(0, $input->getInt('lastid', 0));
|
||||
|
||||
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||
$query = $db->getQuery(true)
|
||||
@@ -88,18 +90,25 @@ class BatchController extends BaseController
|
||||
)
|
||||
->where($db->quoteName('c.state') . ' = 1')
|
||||
->where($db->quoteName('t.id') . ' IS NULL')
|
||||
->where($db->quoteName('c.id') . ' > ' . $lastId)
|
||||
->order($db->quoteName('c.id') . ' ASC');
|
||||
|
||||
// Always offset=0: processed articles now have #__mokoog_tags rows
|
||||
// and are excluded by the LEFT JOIN ... IS NULL filter automatically.
|
||||
// Cursor-based pagination by id: each chunk fetches the next articles whose
|
||||
// id is greater than the previous chunk's highest id. A row that fails to
|
||||
// insert is passed over on the next chunk (its id is already behind the
|
||||
// cursor) instead of being re-fetched forever, so the batch always reaches
|
||||
// the end. The client stops when a chunk examines 0 rows.
|
||||
$db->setQuery($query, 0, $limit);
|
||||
$articles = $db->loadObjectList();
|
||||
|
||||
$created = 0;
|
||||
$skipped = 0;
|
||||
$now = Factory::getDate()->toSql();
|
||||
$created = 0;
|
||||
$skipped = 0;
|
||||
$lastProcessedId = $lastId;
|
||||
$now = Factory::getDate()->toSql();
|
||||
|
||||
foreach ($articles as $article) {
|
||||
$lastProcessedId = (int) $article->id;
|
||||
|
||||
$ogTitle = $article->title;
|
||||
$ogDescription = $this->extractDescription($article);
|
||||
$ogImage = $this->extractImage($article);
|
||||
@@ -131,7 +140,10 @@ class BatchController extends BaseController
|
||||
}
|
||||
|
||||
echo new JsonResponse([
|
||||
'created' => $created,
|
||||
'created' => $created,
|
||||
'skipped' => $skipped,
|
||||
'examined' => \count($articles),
|
||||
'last_id' => $lastProcessedId,
|
||||
]);
|
||||
|
||||
$app->close();
|
||||
|
||||
@@ -234,27 +234,31 @@ document.addEventListener('DOMContentLoaded', function() {
|
||||
return;
|
||||
}
|
||||
status.textContent = total + ' <?php echo Text::_('COM_MOKOOG_BATCH_FOUND', true); ?>';
|
||||
processChunk(0, total, chunkSize, token, bar, status);
|
||||
processChunk(0, 0, total, chunkSize, token, bar, status);
|
||||
})
|
||||
.catch(function(err) {
|
||||
status.textContent = '<?php echo Text::_('COM_MOKOOG_BATCH_ERROR', true); ?> ' + err.message;
|
||||
});
|
||||
}
|
||||
|
||||
function processChunk(processed, total, chunkSize, token, bar, status) {
|
||||
// Always offset=0: processed items are excluded by the IS NULL filter
|
||||
fetch('index.php?option=com_mokoog&task=batch.process&format=json&limit=' + chunkSize + '&' + token + '=1')
|
||||
function processChunk(lastId, processed, total, chunkSize, token, bar, status) {
|
||||
// Cursor-based: pass the highest id seen so far. Failed rows fall behind
|
||||
// the cursor and are not re-fetched, so the loop always terminates.
|
||||
fetch('index.php?option=com_mokoog&task=batch.process&format=json&limit=' + chunkSize + '&lastid=' + lastId + '&' + token + '=1')
|
||||
.then(function(r) { return r.json(); })
|
||||
.then(function(resp) {
|
||||
processed += resp.data.created;
|
||||
var pct = Math.min(100, Math.round((processed / total) * 100));
|
||||
var examined = resp.data.examined || 0;
|
||||
processed += examined;
|
||||
var pct = total > 0 ? Math.min(100, Math.round((processed / total) * 100)) : 100;
|
||||
bar.style.width = pct + '%';
|
||||
bar.textContent = pct + '%';
|
||||
status.textContent = processed + ' / ' + total + ' <?php echo Text::_('COM_MOKOOG_BATCH_PROCESSED', true); ?>';
|
||||
|
||||
if (resp.data.created > 0 && processed < total) {
|
||||
processChunk(processed, total, chunkSize, token, bar, status);
|
||||
if (examined > 0) {
|
||||
processChunk(resp.data.last_id, processed, total, chunkSize, token, bar, status);
|
||||
} else {
|
||||
bar.style.width = '100%';
|
||||
bar.textContent = '100%';
|
||||
bar.classList.remove('progress-bar-animated');
|
||||
bar.classList.add('bg-success');
|
||||
status.textContent = '<?php echo Text::_('COM_MOKOOG_BATCH_COMPLETE', true); ?> ' + processed + ' articles.';
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="content" method="upgrade">
|
||||
<name>Content - MokoSuiteOpenGraph</name>
|
||||
<version>01.06.13</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="system" method="upgrade">
|
||||
<name>System - MokoSuiteOpenGraph</name>
|
||||
<version>01.06.13</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -28,6 +28,11 @@ final class MokoOG extends CMSPlugin implements SubscriberInterface
|
||||
*/
|
||||
protected $autoloadLanguage = true;
|
||||
|
||||
/**
|
||||
* Minimum seconds between full sitemap regenerations (save-time throttle).
|
||||
*/
|
||||
private const SITEMAP_MIN_INTERVAL = 60;
|
||||
|
||||
/**
|
||||
* Returns the events this plugin subscribes to.
|
||||
*
|
||||
@@ -845,6 +850,15 @@ final class MokoOG extends CMSPlugin implements SubscriberInterface
|
||||
return;
|
||||
}
|
||||
|
||||
// Throttle: rebuilding the whole sitemap on every save does not scale
|
||||
// (bulk edits/imports). Regenerate at most once per interval — the
|
||||
// sitemap is eventually consistent within that window.
|
||||
$path = JPATH_ROOT . '/sitemap.xml';
|
||||
|
||||
if (is_file($path) && (time() - filemtime($path)) < self::SITEMAP_MIN_INTERVAL) {
|
||||
return;
|
||||
}
|
||||
|
||||
$changefreq = $this->params->get('sitemap_changefreq', 'weekly');
|
||||
$xml = SitemapBuilder::generate($changefreq);
|
||||
|
||||
|
||||
@@ -57,96 +57,8 @@ class ImageHelper
|
||||
int $targetHeight = self::TARGET_HEIGHT,
|
||||
int $quality = self::JPEG_QUALITY
|
||||
): string {
|
||||
// Resolve absolute path
|
||||
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
||||
|
||||
if (!is_file($absPath)) {
|
||||
return $imagePath;
|
||||
}
|
||||
|
||||
$imageInfo = getimagesize($absPath);
|
||||
|
||||
if (!$imageInfo) {
|
||||
Log::add('MokoOG ImageHelper: Cannot read image dimensions: ' . basename($absPath), Log::WARNING, 'mokoog');
|
||||
|
||||
return $imagePath;
|
||||
}
|
||||
|
||||
[$origWidth, $origHeight, $type] = $imageInfo;
|
||||
|
||||
// Skip if already at or below target size
|
||||
if ($origWidth <= $targetWidth && $origHeight <= $targetHeight) {
|
||||
return $imagePath;
|
||||
}
|
||||
|
||||
// Ensure output directory exists
|
||||
$outputDir = JPATH_ROOT . '/' . self::OUTPUT_DIR;
|
||||
|
||||
if (!is_dir($outputDir) && !Folder::create($outputDir)) {
|
||||
Log::add('MokoOG ImageHelper: Cannot create output directory: ' . self::OUTPUT_DIR, Log::WARNING, 'mokoog');
|
||||
|
||||
return $imagePath;
|
||||
}
|
||||
|
||||
// Generate output filename based on source hash + dimensions
|
||||
$hash = md5($imagePath . $targetWidth . $targetHeight);
|
||||
$outputName = $hash . '.jpg';
|
||||
$outputPath = $outputDir . '/' . $outputName;
|
||||
$outputRel = self::OUTPUT_DIR . '/' . $outputName;
|
||||
|
||||
// Skip if already generated
|
||||
if (is_file($outputPath) && filemtime($outputPath) >= filemtime($absPath)) {
|
||||
return $outputRel;
|
||||
}
|
||||
|
||||
// Load source image
|
||||
$source = self::loadImage($absPath, $type);
|
||||
|
||||
if (!$source) {
|
||||
return $imagePath;
|
||||
}
|
||||
|
||||
// Calculate crop dimensions (center crop to target aspect ratio)
|
||||
$targetRatio = $targetWidth / $targetHeight;
|
||||
$sourceRatio = $origWidth / $origHeight;
|
||||
|
||||
if ($sourceRatio > $targetRatio) {
|
||||
// Source is wider — crop sides
|
||||
$cropHeight = $origHeight;
|
||||
$cropWidth = (int) round($origHeight * $targetRatio);
|
||||
$cropX = (int) round(($origWidth - $cropWidth) / 2);
|
||||
$cropY = 0;
|
||||
} else {
|
||||
// Source is taller — crop top/bottom
|
||||
$cropWidth = $origWidth;
|
||||
$cropHeight = (int) round($origWidth / $targetRatio);
|
||||
$cropX = 0;
|
||||
$cropY = (int) round(($origHeight - $cropHeight) / 2);
|
||||
}
|
||||
|
||||
// Create output canvas and resample
|
||||
$output = imagecreatetruecolor($targetWidth, $targetHeight);
|
||||
|
||||
imagecopyresampled(
|
||||
$output,
|
||||
$source,
|
||||
0,
|
||||
0,
|
||||
$cropX,
|
||||
$cropY,
|
||||
$targetWidth,
|
||||
$targetHeight,
|
||||
$cropWidth,
|
||||
$cropHeight
|
||||
);
|
||||
|
||||
// Save as JPEG
|
||||
imagejpeg($output, $outputPath, $quality);
|
||||
|
||||
imagedestroy($source);
|
||||
imagedestroy($output);
|
||||
|
||||
return $outputRel;
|
||||
// Thin wrapper over the shared implementation (no subdirectory).
|
||||
return self::resizeToSize($imagePath, $targetWidth, $targetHeight, '', $quality);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -182,11 +94,17 @@ class ImageHelper
|
||||
* @param int $width Target width
|
||||
* @param int $height Target height
|
||||
* @param string $subdir Subdirectory name for output (e.g. platform name)
|
||||
* @param int $quality JPEG quality 1-100
|
||||
*
|
||||
* @return string Path to the output image (relative to JPATH_ROOT)
|
||||
*/
|
||||
private static function resizeToSize(string $imagePath, int $width, int $height, string $subdir = ''): string
|
||||
{
|
||||
private static function resizeToSize(
|
||||
string $imagePath,
|
||||
int $width,
|
||||
int $height,
|
||||
string $subdir = '',
|
||||
int $quality = self::JPEG_QUALITY
|
||||
): string {
|
||||
// Resolve absolute path
|
||||
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
||||
|
||||
@@ -272,7 +190,7 @@ class ImageHelper
|
||||
);
|
||||
|
||||
// Save as JPEG
|
||||
imagejpeg($output, $outputPath, self::JPEG_QUALITY);
|
||||
imagejpeg($output, $outputPath, $quality);
|
||||
|
||||
imagedestroy($source);
|
||||
imagedestroy($output);
|
||||
@@ -333,43 +251,6 @@ class ImageHelper
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if an image meets minimum OG size requirements.
|
||||
*
|
||||
* @param string $imagePath Image path relative to JPATH_ROOT
|
||||
*
|
||||
* @return array{valid: bool, width: int, height: int, message: string}
|
||||
*/
|
||||
public static function validate(string $imagePath): array
|
||||
{
|
||||
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
||||
|
||||
if (!is_file($absPath)) {
|
||||
return ['valid' => false, 'width' => 0, 'height' => 0, 'message' => 'File not found'];
|
||||
}
|
||||
|
||||
$imageInfo = getimagesize($absPath);
|
||||
|
||||
if (!$imageInfo) {
|
||||
return ['valid' => false, 'width' => 0, 'height' => 0, 'message' => 'Not a valid image'];
|
||||
}
|
||||
|
||||
[$width, $height] = $imageInfo;
|
||||
|
||||
// Facebook minimum: 200x200, recommended: 1200x630
|
||||
// WhatsApp minimum: 300x200
|
||||
if ($width < 200 || $height < 200) {
|
||||
return [
|
||||
'valid' => false,
|
||||
'width' => $width,
|
||||
'height' => $height,
|
||||
'message' => "Image too small ({$width}x{$height}). Minimum: 200x200px.",
|
||||
];
|
||||
}
|
||||
|
||||
return ['valid' => true, 'width' => $width, 'height' => $height, 'message' => 'OK'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Load an image resource from a file.
|
||||
*
|
||||
|
||||
@@ -81,7 +81,7 @@ class SitemapBuilder
|
||||
continue;
|
||||
}
|
||||
|
||||
$url = $root . '/index.php?option=com_content&view=article&id=' . $article->id;
|
||||
$url = self::articleUrl($article, $root);
|
||||
$lastmod = $article->modified && $article->modified !== '0000-00-00 00:00:00'
|
||||
? date('Y-m-d', strtotime($article->modified)) : '';
|
||||
|
||||
@@ -102,6 +102,45 @@ class SitemapBuilder
|
||||
return $xml;
|
||||
}
|
||||
|
||||
/**
|
||||
* Build the SEF/canonical site URL for an article, with a safe fallback.
|
||||
*
|
||||
* Routes through the site router so the sitemap matches the canonical URLs
|
||||
* the plugin emits. If routing fails (or SEF is off), falls back to the
|
||||
* non-SEF index.php URL — never an empty or broken URL.
|
||||
*
|
||||
* @param object $article Row with id, alias, catid, language
|
||||
* @param string $root Site root without trailing slash
|
||||
*
|
||||
* @return string Absolute URL
|
||||
*/
|
||||
private static function articleUrl(object $article, string $root): string
|
||||
{
|
||||
$fallback = $root . '/index.php?option=com_content&view=article&id=' . (int) $article->id;
|
||||
|
||||
$internal = 'index.php?option=com_content&view=article&id=' . (int) $article->id
|
||||
. (!empty($article->alias) ? ':' . $article->alias : '')
|
||||
. (!empty($article->catid) ? '&catid=' . (int) $article->catid : '');
|
||||
|
||||
try {
|
||||
$routed = \Joomla\CMS\Router\Route::link(
|
||||
'site',
|
||||
$internal,
|
||||
false,
|
||||
\Joomla\CMS\Router\Route::TLS_IGNORE,
|
||||
true
|
||||
);
|
||||
|
||||
if (\is_string($routed) && $routed !== '') {
|
||||
return $routed;
|
||||
}
|
||||
} catch (\Throwable $e) {
|
||||
// Fall back to the non-SEF URL below.
|
||||
}
|
||||
|
||||
return $fallback;
|
||||
}
|
||||
|
||||
/**
|
||||
* Write sitemap XML to the site root.
|
||||
*
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
-->
|
||||
<extension type="plugin" group="webservices" method="upgrade">
|
||||
<name>Web Services - MokoSuiteOpenGraph</name>
|
||||
<version>01.06.13</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
<extension type="package" method="upgrade">
|
||||
<name>Package - MokoSuiteOpenGraph</name>
|
||||
<packagename>mokoog</packagename>
|
||||
<version>01.06.13</version>
|
||||
<version>01.07.05</version>
|
||||
<creationDate>2026-05-23</creationDate>
|
||||
<author>Moko Consulting</author>
|
||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||
|
||||
+93
-1
@@ -50,9 +50,10 @@ class Pkg_MokoOGInstallerScript
|
||||
|
||||
public function postflight(string $type, InstallerAdapter $parent): void
|
||||
{
|
||||
// The download key must be restored regardless of the install outcome.
|
||||
$this->restoreDownloadKey();
|
||||
$this->warnMissingLicenseKey();
|
||||
|
||||
// Housekeeping: ensure the bundled plugins are enabled after a fresh install.
|
||||
if ($type === 'install')
|
||||
{
|
||||
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||
@@ -69,6 +70,97 @@ class Pkg_MokoOGInstallerScript
|
||||
)->execute();
|
||||
}
|
||||
}
|
||||
|
||||
// Be smart: only run the success path (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>MokoSuiteOpenGraph 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 Installer adapter
|
||||
*
|
||||
* @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::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||
|
||||
foreach ($manifest->files->file as $file)
|
||||
{
|
||||
$childType = (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 ($childType !== '')
|
||||
{
|
||||
$query->where($db->quoteName('type') . ' = ' . $db->quote($childType));
|
||||
}
|
||||
|
||||
// Plugins are only unique by element + folder (the manifest "group").
|
||||
if ($childType === '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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user