Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a038e43a3c | |||
| b93ce7b872 |
@@ -5,7 +5,7 @@
|
|||||||
# FILE INFORMATION
|
# FILE INFORMATION
|
||||||
# DEFGROUP: Gitea.Workflow
|
# DEFGROUP: Gitea.Workflow
|
||||||
# INGROUP: mokocli.Automation
|
# INGROUP: mokocli.Automation
|
||||||
# VERSION: 01.07.09
|
# VERSION: 01.07.00
|
||||||
# BRIEF: Auto-create feature branch when an issue is opened
|
# BRIEF: Auto-create feature branch when an issue is opened
|
||||||
|
|
||||||
name: "Universal: Issue Branch"
|
name: "Universal: Issue Branch"
|
||||||
|
|||||||
+5
-2
@@ -1,12 +1,15 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [Unreleased]
|
||||||
|
|
||||||
|
|
||||||
All notable changes to MokoSuiteOpenGraph will be documented in this file.
|
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/).
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
|
||||||
|
|
||||||
<!-- VERSION: 01.07.09 -->
|
<!-- VERSION: 01.07.00 -->
|
||||||
|
|
||||||
## [Unreleased]
|
## [01.07.00] --- 2026-06-29
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
- OG coverage **dashboard** as the default admin view — SVG donut gauge, coverage by content type, and a list of articles missing OG tags with a batch-generate shortcut (#94)
|
- OG coverage **dashboard** as the default admin view — SVG donut gauge, coverage by content type, and a list of articles missing OG tags with a batch-generate shortcut (#94)
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
DEFGROUP: Template-Joomla
|
DEFGROUP: Template-Joomla
|
||||||
INGROUP: Template-Joomla.Documentation
|
INGROUP: Template-Joomla.Documentation
|
||||||
REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
|
REPO: https://github.com/mokoconsulting-tech/Template-Joomla/
|
||||||
VERSION: 01.07.09
|
VERSION: 01.07.00
|
||||||
PATH: ./CODE_OF_CONDUCT.md
|
PATH: ./CODE_OF_CONDUCT.md
|
||||||
BRIEF: Community expectations and enforcement guidelines
|
BRIEF: Community expectations and enforcement guidelines
|
||||||
NOTE: Adapted with attribution from the Contributor Covenant v2.1
|
NOTE: Adapted with attribution from the Contributor Covenant v2.1
|
||||||
|
|||||||
+1
-1
@@ -19,7 +19,7 @@
|
|||||||
DEFGROUP: mokoconsulting-tech.Template-Joomla
|
DEFGROUP: mokoconsulting-tech.Template-Joomla
|
||||||
INGROUP: MokoStandards.Governance
|
INGROUP: MokoStandards.Governance
|
||||||
REPO: https://github.com/mokoconsulting-tech/Template-Joomla
|
REPO: https://github.com/mokoconsulting-tech/Template-Joomla
|
||||||
VERSION: 01.07.09
|
VERSION: 01.07.00
|
||||||
PATH: /GOVERNANCE.md
|
PATH: /GOVERNANCE.md
|
||||||
BRIEF: Project governance rules, roles, and decision process for Template-Joomla
|
BRIEF: Project governance rules, roles, and decision process for Template-Joomla
|
||||||
-->
|
-->
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
# MokoSuiteOpenGraph
|
# MokoSuiteOpenGraph
|
||||||
|
|
||||||
<!-- VERSION: 01.07.09 -->
|
<!-- VERSION: 01.07.00 -->
|
||||||
|
|
||||||
Open Graph, Twitter Card, and social sharing meta tag management for Joomla 6 and higher.
|
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
|
INGROUP: Template-Joomla.Documentation
|
||||||
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
|
REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Joomla
|
||||||
PATH: /SECURITY.md
|
PATH: /SECURITY.md
|
||||||
VERSION: 01.07.09
|
VERSION: 01.07.00
|
||||||
BRIEF: Security vulnerability reporting and handling policy
|
BRIEF: Security vulnerability reporting and handling policy
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|||||||
@@ -3,5 +3,4 @@
|
|||||||
; License: GPL-3.0-or-later
|
; License: GPL-3.0-or-later
|
||||||
|
|
||||||
COM_MOKOOG="MokoSuiteOpenGraph"
|
COM_MOKOOG="MokoSuiteOpenGraph"
|
||||||
COM_MOKOOG_SHORT="OpenGraph"
|
|
||||||
COM_MOKOOG_DESCRIPTION="Manage Open Graph and social sharing tags for all your content. View, edit, and batch-process OG metadata."
|
COM_MOKOOG_DESCRIPTION="Manage Open Graph and social sharing tags for all your content. View, edit, and batch-process OG metadata."
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
-->
|
-->
|
||||||
<extension type="component" method="upgrade">
|
<extension type="component" method="upgrade">
|
||||||
<name>com_mokoog</name>
|
<name>com_mokoog</name>
|
||||||
<version>01.07.09</version>
|
<version>01.07.00</version>
|
||||||
<creationDate>2026-05-23</creationDate>
|
<creationDate>2026-05-23</creationDate>
|
||||||
<author>Moko Consulting</author>
|
<author>Moko Consulting</author>
|
||||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||||
@@ -71,7 +71,7 @@
|
|||||||
<filename>access.xml</filename>
|
<filename>access.xml</filename>
|
||||||
<filename>config.xml</filename>
|
<filename>config.xml</filename>
|
||||||
</files>
|
</files>
|
||||||
<menu img="class:bookmark">COM_MOKOOG_SHORT</menu>
|
<menu img="class:bookmark">COM_MOKOOG</menu>
|
||||||
<submenu>
|
<submenu>
|
||||||
<menu link="option=com_mokoog&view=dashboard">COM_MOKOOG_SUBMENU_DASHBOARD</menu>
|
<menu link="option=com_mokoog&view=dashboard">COM_MOKOOG_SUBMENU_DASHBOARD</menu>
|
||||||
<menu link="option=com_mokoog&view=tags">COM_MOKOOG_SUBMENU_TAGS</menu>
|
<menu link="option=com_mokoog&view=tags">COM_MOKOOG_SUBMENU_TAGS</menu>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
|
|
||||||
defined('_JEXEC') or die;
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
use Joomla\CMS\Factory;
|
|
||||||
use Joomla\CMS\Installer\InstallerAdapter;
|
use Joomla\CMS\Installer\InstallerAdapter;
|
||||||
|
|
||||||
class Com_MokoOGInstallerScript
|
class Com_MokoOGInstallerScript
|
||||||
@@ -24,26 +23,7 @@ class Com_MokoOGInstallerScript
|
|||||||
*/
|
*/
|
||||||
public function install(InstallerAdapter $parent): void
|
public function install(InstallerAdapter $parent): void
|
||||||
{
|
{
|
||||||
// Be smart: verify EVERY table the component's own install SQL declares is
|
echo '<p>MokoSuiteOpenGraph component installed successfully.</p>';
|
||||||
// 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');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -55,65 +35,6 @@ class Com_MokoOGInstallerScript
|
|||||||
*/
|
*/
|
||||||
public function update(InstallerAdapter $parent): void
|
public function update(InstallerAdapter $parent): void
|
||||||
{
|
{
|
||||||
// Same smart check on update: only report success if the schema is intact.
|
echo '<p>MokoSuiteOpenGraph component updated successfully.</p>';
|
||||||
$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.00 — no schema changes */
|
||||||
@@ -1 +0,0 @@
|
|||||||
/* 01.07.01 — no schema changes */
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/* 01.07.02 — no schema changes */
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/* 01.07.03 — no schema changes */
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/* 01.07.05 — no schema changes */
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/* 01.07.07 — no schema changes */
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/* 01.07.08 — no schema changes */
|
|
||||||
@@ -1 +0,0 @@
|
|||||||
/* 01.07.09 — no schema changes */
|
|
||||||
@@ -73,9 +73,7 @@ class BatchController extends BaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
$app = Factory::getApplication();
|
$app = Factory::getApplication();
|
||||||
$input = $app->getInput();
|
$limit = min($app->getInput()->getInt('limit', 50), 200);
|
||||||
$limit = min($input->getInt('limit', 50), 200);
|
|
||||||
$lastId = max(0, $input->getInt('lastid', 0));
|
|
||||||
|
|
||||||
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||||
$query = $db->getQuery(true)
|
$query = $db->getQuery(true)
|
||||||
@@ -90,25 +88,18 @@ class BatchController extends BaseController
|
|||||||
)
|
)
|
||||||
->where($db->quoteName('c.state') . ' = 1')
|
->where($db->quoteName('c.state') . ' = 1')
|
||||||
->where($db->quoteName('t.id') . ' IS NULL')
|
->where($db->quoteName('t.id') . ' IS NULL')
|
||||||
->where($db->quoteName('c.id') . ' > ' . $lastId)
|
|
||||||
->order($db->quoteName('c.id') . ' ASC');
|
->order($db->quoteName('c.id') . ' ASC');
|
||||||
|
|
||||||
// Cursor-based pagination by id: each chunk fetches the next articles whose
|
// Always offset=0: processed articles now have #__mokoog_tags rows
|
||||||
// id is greater than the previous chunk's highest id. A row that fails to
|
// and are excluded by the LEFT JOIN ... IS NULL filter automatically.
|
||||||
// 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);
|
$db->setQuery($query, 0, $limit);
|
||||||
$articles = $db->loadObjectList();
|
$articles = $db->loadObjectList();
|
||||||
|
|
||||||
$created = 0;
|
$created = 0;
|
||||||
$skipped = 0;
|
$skipped = 0;
|
||||||
$lastProcessedId = $lastId;
|
|
||||||
$now = Factory::getDate()->toSql();
|
$now = Factory::getDate()->toSql();
|
||||||
|
|
||||||
foreach ($articles as $article) {
|
foreach ($articles as $article) {
|
||||||
$lastProcessedId = (int) $article->id;
|
|
||||||
|
|
||||||
$ogTitle = $article->title;
|
$ogTitle = $article->title;
|
||||||
$ogDescription = $this->extractDescription($article);
|
$ogDescription = $this->extractDescription($article);
|
||||||
$ogImage = $this->extractImage($article);
|
$ogImage = $this->extractImage($article);
|
||||||
@@ -141,9 +132,6 @@ class BatchController extends BaseController
|
|||||||
|
|
||||||
echo new JsonResponse([
|
echo new JsonResponse([
|
||||||
'created' => $created,
|
'created' => $created,
|
||||||
'skipped' => $skipped,
|
|
||||||
'examined' => \count($articles),
|
|
||||||
'last_id' => $lastProcessedId,
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$app->close();
|
$app->close();
|
||||||
|
|||||||
@@ -234,31 +234,27 @@ document.addEventListener('DOMContentLoaded', function() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
status.textContent = total + ' <?php echo Text::_('COM_MOKOOG_BATCH_FOUND', true); ?>';
|
status.textContent = total + ' <?php echo Text::_('COM_MOKOOG_BATCH_FOUND', true); ?>';
|
||||||
processChunk(0, 0, total, chunkSize, token, bar, status);
|
processChunk(0, total, chunkSize, token, bar, status);
|
||||||
})
|
})
|
||||||
.catch(function(err) {
|
.catch(function(err) {
|
||||||
status.textContent = '<?php echo Text::_('COM_MOKOOG_BATCH_ERROR', true); ?> ' + err.message;
|
status.textContent = '<?php echo Text::_('COM_MOKOOG_BATCH_ERROR', true); ?> ' + err.message;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function processChunk(lastId, processed, total, chunkSize, token, bar, status) {
|
function processChunk(processed, total, chunkSize, token, bar, status) {
|
||||||
// Cursor-based: pass the highest id seen so far. Failed rows fall behind
|
// Always offset=0: processed items are excluded by the IS NULL filter
|
||||||
// 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 + '&' + token + '=1')
|
||||||
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(r) { return r.json(); })
|
||||||
.then(function(resp) {
|
.then(function(resp) {
|
||||||
var examined = resp.data.examined || 0;
|
processed += resp.data.created;
|
||||||
processed += examined;
|
var pct = Math.min(100, Math.round((processed / total) * 100));
|
||||||
var pct = total > 0 ? Math.min(100, Math.round((processed / total) * 100)) : 100;
|
|
||||||
bar.style.width = pct + '%';
|
bar.style.width = pct + '%';
|
||||||
bar.textContent = pct + '%';
|
bar.textContent = pct + '%';
|
||||||
status.textContent = processed + ' / ' + total + ' <?php echo Text::_('COM_MOKOOG_BATCH_PROCESSED', true); ?>';
|
status.textContent = processed + ' / ' + total + ' <?php echo Text::_('COM_MOKOOG_BATCH_PROCESSED', true); ?>';
|
||||||
|
|
||||||
if (examined > 0) {
|
if (resp.data.created > 0 && processed < total) {
|
||||||
processChunk(resp.data.last_id, processed, total, chunkSize, token, bar, status);
|
processChunk(processed, total, chunkSize, token, bar, status);
|
||||||
} else {
|
} else {
|
||||||
bar.style.width = '100%';
|
|
||||||
bar.textContent = '100%';
|
|
||||||
bar.classList.remove('progress-bar-animated');
|
bar.classList.remove('progress-bar-animated');
|
||||||
bar.classList.add('bg-success');
|
bar.classList.add('bg-success');
|
||||||
status.textContent = '<?php echo Text::_('COM_MOKOOG_BATCH_COMPLETE', true); ?> ' + processed + ' articles.';
|
status.textContent = '<?php echo Text::_('COM_MOKOOG_BATCH_COMPLETE', true); ?> ' + processed + ' articles.';
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
-->
|
-->
|
||||||
<extension type="plugin" group="content" method="upgrade">
|
<extension type="plugin" group="content" method="upgrade">
|
||||||
<name>Content - MokoSuiteOpenGraph</name>
|
<name>Content - MokoSuiteOpenGraph</name>
|
||||||
<version>01.07.09</version>
|
<version>01.07.00</version>
|
||||||
<creationDate>2026-05-23</creationDate>
|
<creationDate>2026-05-23</creationDate>
|
||||||
<author>Moko Consulting</author>
|
<author>Moko Consulting</author>
|
||||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
-->
|
-->
|
||||||
<extension type="plugin" group="system" method="upgrade">
|
<extension type="plugin" group="system" method="upgrade">
|
||||||
<name>System - MokoSuiteOpenGraph</name>
|
<name>System - MokoSuiteOpenGraph</name>
|
||||||
<version>01.07.09</version>
|
<version>01.07.00</version>
|
||||||
<creationDate>2026-05-23</creationDate>
|
<creationDate>2026-05-23</creationDate>
|
||||||
<author>Moko Consulting</author>
|
<author>Moko Consulting</author>
|
||||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||||
|
|||||||
@@ -28,11 +28,6 @@ final class MokoOG extends CMSPlugin implements SubscriberInterface
|
|||||||
*/
|
*/
|
||||||
protected $autoloadLanguage = true;
|
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.
|
* Returns the events this plugin subscribes to.
|
||||||
*
|
*
|
||||||
@@ -850,15 +845,6 @@ final class MokoOG extends CMSPlugin implements SubscriberInterface
|
|||||||
return;
|
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');
|
$changefreq = $this->params->get('sitemap_changefreq', 'weekly');
|
||||||
$xml = SitemapBuilder::generate($changefreq);
|
$xml = SitemapBuilder::generate($changefreq);
|
||||||
|
|
||||||
|
|||||||
@@ -57,8 +57,96 @@ class ImageHelper
|
|||||||
int $targetHeight = self::TARGET_HEIGHT,
|
int $targetHeight = self::TARGET_HEIGHT,
|
||||||
int $quality = self::JPEG_QUALITY
|
int $quality = self::JPEG_QUALITY
|
||||||
): string {
|
): string {
|
||||||
// Thin wrapper over the shared implementation (no subdirectory).
|
// Resolve absolute path
|
||||||
return self::resizeToSize($imagePath, $targetWidth, $targetHeight, '', $quality);
|
$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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -94,17 +182,11 @@ class ImageHelper
|
|||||||
* @param int $width Target width
|
* @param int $width Target width
|
||||||
* @param int $height Target height
|
* @param int $height Target height
|
||||||
* @param string $subdir Subdirectory name for output (e.g. platform name)
|
* @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)
|
* @return string Path to the output image (relative to JPATH_ROOT)
|
||||||
*/
|
*/
|
||||||
private static function resizeToSize(
|
private static function resizeToSize(string $imagePath, int $width, int $height, string $subdir = ''): string
|
||||||
string $imagePath,
|
{
|
||||||
int $width,
|
|
||||||
int $height,
|
|
||||||
string $subdir = '',
|
|
||||||
int $quality = self::JPEG_QUALITY
|
|
||||||
): string {
|
|
||||||
// Resolve absolute path
|
// Resolve absolute path
|
||||||
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
||||||
|
|
||||||
@@ -190,7 +272,7 @@ class ImageHelper
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Save as JPEG
|
// Save as JPEG
|
||||||
imagejpeg($output, $outputPath, $quality);
|
imagejpeg($output, $outputPath, self::JPEG_QUALITY);
|
||||||
|
|
||||||
imagedestroy($source);
|
imagedestroy($source);
|
||||||
imagedestroy($output);
|
imagedestroy($output);
|
||||||
@@ -251,6 +333,43 @@ 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.
|
* Load an image resource from a file.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class SitemapBuilder
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
$url = self::articleUrl($article, $root);
|
$url = $root . '/index.php?option=com_content&view=article&id=' . $article->id;
|
||||||
$lastmod = $article->modified && $article->modified !== '0000-00-00 00:00:00'
|
$lastmod = $article->modified && $article->modified !== '0000-00-00 00:00:00'
|
||||||
? date('Y-m-d', strtotime($article->modified)) : '';
|
? date('Y-m-d', strtotime($article->modified)) : '';
|
||||||
|
|
||||||
@@ -102,45 +102,6 @@ class SitemapBuilder
|
|||||||
return $xml;
|
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.
|
* Write sitemap XML to the site root.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
-->
|
-->
|
||||||
<extension type="plugin" group="webservices" method="upgrade">
|
<extension type="plugin" group="webservices" method="upgrade">
|
||||||
<name>Web Services - MokoSuiteOpenGraph</name>
|
<name>Web Services - MokoSuiteOpenGraph</name>
|
||||||
<version>01.07.09</version>
|
<version>01.07.00</version>
|
||||||
<creationDate>2026-05-23</creationDate>
|
<creationDate>2026-05-23</creationDate>
|
||||||
<author>Moko Consulting</author>
|
<author>Moko Consulting</author>
|
||||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
<extension type="package" method="upgrade">
|
<extension type="package" method="upgrade">
|
||||||
<name>Package - MokoSuiteOpenGraph</name>
|
<name>Package - MokoSuiteOpenGraph</name>
|
||||||
<packagename>mokoog</packagename>
|
<packagename>mokoog</packagename>
|
||||||
<version>01.07.09</version>
|
<version>01.07.00</version>
|
||||||
<creationDate>2026-05-23</creationDate>
|
<creationDate>2026-05-23</creationDate>
|
||||||
<author>Moko Consulting</author>
|
<author>Moko Consulting</author>
|
||||||
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
<authorEmail>hello@mokoconsulting.tech</authorEmail>
|
||||||
|
|||||||
+1
-93
@@ -50,10 +50,9 @@ class Pkg_MokoOGInstallerScript
|
|||||||
|
|
||||||
public function postflight(string $type, InstallerAdapter $parent): void
|
public function postflight(string $type, InstallerAdapter $parent): void
|
||||||
{
|
{
|
||||||
// The download key must be restored regardless of the install outcome.
|
|
||||||
$this->restoreDownloadKey();
|
$this->restoreDownloadKey();
|
||||||
|
$this->warnMissingLicenseKey();
|
||||||
|
|
||||||
// Housekeeping: ensure the bundled plugins are enabled after a fresh install.
|
|
||||||
if ($type === 'install')
|
if ($type === 'install')
|
||||||
{
|
{
|
||||||
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||||
@@ -70,97 +69,6 @@ class Pkg_MokoOGInstallerScript
|
|||||||
)->execute();
|
)->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