Compare commits
9 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| ee80111336 | |||
| 29f83d06ee | |||
| 84b3d9dc2c | |||
| d6d93bddd9 | |||
| 3e6c8d685b | |||
| 236baed80d | |||
| fd28cb8a93 | |||
| cb0e5596ea | |||
| 7532446e46 |
@@ -5,7 +5,7 @@
|
|||||||
# FILE INFORMATION
|
# FILE INFORMATION
|
||||||
# DEFGROUP: Gitea.Workflow
|
# DEFGROUP: Gitea.Workflow
|
||||||
# INGROUP: mokocli.Automation
|
# INGROUP: mokocli.Automation
|
||||||
# VERSION: 01.06.13
|
# VERSION: 01.07.06
|
||||||
# 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"
|
||||||
|
|||||||
+4
-1
@@ -4,10 +4,13 @@ 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.06.13 -->
|
<!-- VERSION: 01.07.06 -->
|
||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
- **Honest install success** — the installer no longer claims success or shows the license message when the install partially failed. The package postflight verifies every child extension declared in the manifest registered in `#__extensions`; the `com_mokoog` component script verifies its declared tables exist before echoing the success message. Both checks fail open, so a transient DB/IO glitch never fakes a failure.
|
||||||
|
|
||||||
### 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)
|
||||||
- Single OG tag **create/edit screen** in the admin (the tag manager was previously read-only) (#98)
|
- Single OG tag **create/edit screen** in the admin (the tag manager was previously read-only) (#98)
|
||||||
|
|||||||
+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.06.13
|
VERSION: 01.07.06
|
||||||
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.06.13
|
VERSION: 01.07.06
|
||||||
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.06.13 -->
|
<!-- VERSION: 01.07.06 -->
|
||||||
|
|
||||||
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.06.13
|
VERSION: 01.07.06
|
||||||
BRIEF: Security vulnerability reporting and handling policy
|
BRIEF: Security vulnerability reporting and handling policy
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@
|
|||||||
-->
|
-->
|
||||||
<extension type="component" method="upgrade">
|
<extension type="component" method="upgrade">
|
||||||
<name>com_mokoog</name>
|
<name>com_mokoog</name>
|
||||||
<version>01.06.13</version>
|
<version>01.07.06</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>
|
||||||
|
|||||||
@@ -10,7 +10,9 @@
|
|||||||
|
|
||||||
defined('_JEXEC') or die;
|
defined('_JEXEC') or die;
|
||||||
|
|
||||||
|
use Joomla\CMS\Factory;
|
||||||
use Joomla\CMS\Installer\InstallerAdapter;
|
use Joomla\CMS\Installer\InstallerAdapter;
|
||||||
|
use Joomla\Database\DatabaseInterface;
|
||||||
|
|
||||||
class Com_MokoOGInstallerScript
|
class Com_MokoOGInstallerScript
|
||||||
{
|
{
|
||||||
@@ -23,6 +25,20 @@ class Com_MokoOGInstallerScript
|
|||||||
*/
|
*/
|
||||||
public function install(InstallerAdapter $parent): void
|
public function install(InstallerAdapter $parent): void
|
||||||
{
|
{
|
||||||
|
// Be honest about success: don't claim a clean install if the component's
|
||||||
|
// own tables never landed. Fails open (see missingTables) so a query/IO
|
||||||
|
// glitch never fakes a failure.
|
||||||
|
$missing = $this->missingTables();
|
||||||
|
|
||||||
|
if (!empty($missing))
|
||||||
|
{
|
||||||
|
echo '<p>MokoSuiteOpenGraph component did not install correctly. '
|
||||||
|
. 'Missing database table(s): '
|
||||||
|
. htmlspecialchars(implode(', ', $missing), ENT_QUOTES) . '.</p>';
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
echo '<p>MokoSuiteOpenGraph component installed successfully.</p>';
|
echo '<p>MokoSuiteOpenGraph component installed successfully.</p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -35,6 +51,69 @@ class Com_MokoOGInstallerScript
|
|||||||
*/
|
*/
|
||||||
public function update(InstallerAdapter $parent): void
|
public function update(InstallerAdapter $parent): void
|
||||||
{
|
{
|
||||||
|
$missing = $this->missingTables();
|
||||||
|
|
||||||
|
if (!empty($missing))
|
||||||
|
{
|
||||||
|
echo '<p>MokoSuiteOpenGraph component did not update correctly. '
|
||||||
|
. 'Missing database table(s): '
|
||||||
|
. htmlspecialchars(implode(', ', $missing), ENT_QUOTES) . '.</p>';
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
echo '<p>MokoSuiteOpenGraph component updated successfully.</p>';
|
echo '<p>MokoSuiteOpenGraph component updated successfully.</p>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verify the component's declared tables actually exist. Reads the shipped
|
||||||
|
* install SQL, extracts every CREATE TABLE #__name, resolves the live prefix,
|
||||||
|
* and checks each against the database's table list (case-insensitive).
|
||||||
|
*
|
||||||
|
* FAILS OPEN: any error (unreadable SQL, query failure) returns [] so a
|
||||||
|
* transient glitch never turns a good install into a false failure.
|
||||||
|
*
|
||||||
|
* @return string[] Prefixed names of any missing tables.
|
||||||
|
*/
|
||||||
|
private function missingTables(): array
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$sqlFile = JPATH_ADMINISTRATOR . '/components/com_mokoog/sql/install.mysql.sql';
|
||||||
|
|
||||||
|
if (!is_file($sqlFile))
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$sql = (string) file_get_contents($sqlFile);
|
||||||
|
|
||||||
|
if ($sql === '' || !preg_match_all('/CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?[`"\']?(#__[A-Za-z0-9_]+)/i', $sql, $m))
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = Factory::getContainer()->get(DatabaseInterface::class);
|
||||||
|
$prefix = $db->getPrefix();
|
||||||
|
$existing = array_map('strtolower', (array) $db->getTableList());
|
||||||
|
$missing = [];
|
||||||
|
|
||||||
|
foreach (array_unique($m[1]) as $table)
|
||||||
|
{
|
||||||
|
$real = str_replace('#__', $prefix, $table);
|
||||||
|
|
||||||
|
if (!in_array(strtolower($real), $existing, true))
|
||||||
|
{
|
||||||
|
$missing[] = $real;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $missing;
|
||||||
|
}
|
||||||
|
catch (\Throwable $e)
|
||||||
|
{
|
||||||
|
// Fail open — never fake a failure on a glitch.
|
||||||
|
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.06 — no schema changes */
|
||||||
@@ -73,7 +73,9 @@ class BatchController extends BaseController
|
|||||||
}
|
}
|
||||||
|
|
||||||
$app = Factory::getApplication();
|
$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);
|
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||||
$query = $db->getQuery(true)
|
$query = $db->getQuery(true)
|
||||||
@@ -88,18 +90,25 @@ 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');
|
||||||
|
|
||||||
// Always offset=0: processed articles now have #__mokoog_tags rows
|
// Cursor-based pagination by id: each chunk fetches the next articles whose
|
||||||
// and are excluded by the LEFT JOIN ... IS NULL filter automatically.
|
// 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);
|
$db->setQuery($query, 0, $limit);
|
||||||
$articles = $db->loadObjectList();
|
$articles = $db->loadObjectList();
|
||||||
|
|
||||||
$created = 0;
|
$created = 0;
|
||||||
$skipped = 0;
|
$skipped = 0;
|
||||||
$now = Factory::getDate()->toSql();
|
$lastProcessedId = $lastId;
|
||||||
|
$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);
|
||||||
@@ -131,7 +140,10 @@ 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,27 +234,31 @@ 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, total, chunkSize, token, bar, status);
|
processChunk(0, 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(processed, total, chunkSize, token, bar, status) {
|
function processChunk(lastId, processed, total, chunkSize, token, bar, status) {
|
||||||
// Always offset=0: processed items are excluded by the IS NULL filter
|
// Cursor-based: pass the highest id seen so far. Failed rows fall behind
|
||||||
fetch('index.php?option=com_mokoog&task=batch.process&format=json&limit=' + chunkSize + '&' + token + '=1')
|
// 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(r) { return r.json(); })
|
||||||
.then(function(resp) {
|
.then(function(resp) {
|
||||||
processed += resp.data.created;
|
var examined = resp.data.examined || 0;
|
||||||
var pct = Math.min(100, Math.round((processed / total) * 100));
|
processed += examined;
|
||||||
|
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 (resp.data.created > 0 && processed < total) {
|
if (examined > 0) {
|
||||||
processChunk(processed, total, chunkSize, token, bar, status);
|
processChunk(resp.data.last_id, 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.06.13</version>
|
<version>01.07.06</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.06.13</version>
|
<version>01.07.06</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,6 +28,11 @@ 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.
|
||||||
*
|
*
|
||||||
@@ -845,6 +850,15 @@ 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,96 +57,8 @@ class ImageHelper
|
|||||||
int $targetHeight = self::TARGET_HEIGHT,
|
int $targetHeight = self::TARGET_HEIGHT,
|
||||||
int $quality = self::JPEG_QUALITY
|
int $quality = self::JPEG_QUALITY
|
||||||
): string {
|
): string {
|
||||||
// Resolve absolute path
|
// Thin wrapper over the shared implementation (no subdirectory).
|
||||||
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
return self::resizeToSize($imagePath, $targetWidth, $targetHeight, '', $quality);
|
||||||
|
|
||||||
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;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -182,11 +94,17 @@ 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(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
|
// Resolve absolute path
|
||||||
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
$absPath = JPATH_ROOT . '/' . ltrim($imagePath, '/');
|
||||||
|
|
||||||
@@ -272,7 +190,7 @@ class ImageHelper
|
|||||||
);
|
);
|
||||||
|
|
||||||
// Save as JPEG
|
// Save as JPEG
|
||||||
imagejpeg($output, $outputPath, self::JPEG_QUALITY);
|
imagejpeg($output, $outputPath, $quality);
|
||||||
|
|
||||||
imagedestroy($source);
|
imagedestroy($source);
|
||||||
imagedestroy($output);
|
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.
|
* Load an image resource from a file.
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ class SitemapBuilder
|
|||||||
continue;
|
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'
|
$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,6 +102,45 @@ 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.06.13</version>
|
<version>01.07.06</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.06.13</version>
|
<version>01.07.06</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>
|
||||||
|
|||||||
+96
-1
@@ -51,8 +51,8 @@ class Pkg_MokoOGInstallerScript
|
|||||||
public function postflight(string $type, InstallerAdapter $parent): void
|
public function postflight(string $type, InstallerAdapter $parent): void
|
||||||
{
|
{
|
||||||
$this->restoreDownloadKey();
|
$this->restoreDownloadKey();
|
||||||
$this->warnMissingLicenseKey();
|
|
||||||
|
|
||||||
|
// Enable plugins after first install (unconditional module/plugin setup)
|
||||||
if ($type === 'install')
|
if ($type === 'install')
|
||||||
{
|
{
|
||||||
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||||
@@ -69,6 +69,101 @@ class Pkg_MokoOGInstallerScript
|
|||||||
)->execute();
|
)->execute();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Be honest about success. Joomla's package installer only LOGS a failed child
|
||||||
|
// sub-install but still runs this postflight, so don't show the license /
|
||||||
|
// next-steps message if a bundled extension is actually missing. Fails open
|
||||||
|
// (see missingChildExtensions) so a query/IO glitch never fakes a failure.
|
||||||
|
$missing = $this->missingChildExtensions($parent);
|
||||||
|
|
||||||
|
if (!empty($missing))
|
||||||
|
{
|
||||||
|
Factory::getApplication()->enqueueMessage(
|
||||||
|
'<h4>MokoSuiteOpenGraph did not install correctly.</h4>'
|
||||||
|
. '<p>The following bundled extensions are missing: '
|
||||||
|
. htmlspecialchars(implode(', ', $missing), ENT_QUOTES) . '</p>'
|
||||||
|
. '<p>Please uninstall MokoSuiteOpenGraph and reinstall the full package.</p>',
|
||||||
|
'error'
|
||||||
|
);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->warnMissingLicenseKey();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Verify every child extension declared in the package manifest actually landed
|
||||||
|
* in #__extensions. Returns readable labels of any that are missing.
|
||||||
|
*
|
||||||
|
* element = <file> "id", EXCEPT plugins strip a leading plg_<group>_; plugins also
|
||||||
|
* match folder = <file> "group". FAILS OPEN — any error returns [] so a transient
|
||||||
|
* glitch never turns a good install into a false failure.
|
||||||
|
*/
|
||||||
|
private function missingChildExtensions($parent): array
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
$manifest = $parent->getParent()->getManifest();
|
||||||
|
|
||||||
|
if (!$manifest || !isset($manifest->files) || !isset($manifest->files->file))
|
||||||
|
{
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$db = Factory::getContainer()->get(\Joomla\Database\DatabaseInterface::class);
|
||||||
|
$missing = [];
|
||||||
|
|
||||||
|
foreach ($manifest->files->file as $file)
|
||||||
|
{
|
||||||
|
$attrs = $file->attributes();
|
||||||
|
$id = isset($attrs['id']) ? (string) $attrs['id'] : '';
|
||||||
|
$exType = isset($attrs['type']) ? (string) $attrs['type'] : '';
|
||||||
|
|
||||||
|
if ($id === '' || $exType === '')
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
$group = isset($attrs['group']) ? (string) $attrs['group'] : '';
|
||||||
|
$element = $id;
|
||||||
|
|
||||||
|
// Plugin element in #__extensions is the id minus any leading plg_<group>_.
|
||||||
|
if ($exType === 'plugin' && $group !== '')
|
||||||
|
{
|
||||||
|
$prefix = 'plg_' . $group . '_';
|
||||||
|
|
||||||
|
if (strpos($element, $prefix) === 0)
|
||||||
|
{
|
||||||
|
$element = substr($element, \strlen($prefix));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$query = $db->getQuery(true)
|
||||||
|
->select('COUNT(*)')
|
||||||
|
->from($db->quoteName('#__extensions'))
|
||||||
|
->where($db->quoteName('element') . ' = ' . $db->quote($element))
|
||||||
|
->where($db->quoteName('type') . ' = ' . $db->quote($exType));
|
||||||
|
|
||||||
|
if ($exType === 'plugin' && $group !== '')
|
||||||
|
{
|
||||||
|
$query->where($db->quoteName('folder') . ' = ' . $db->quote($group));
|
||||||
|
}
|
||||||
|
|
||||||
|
if ((int) $db->setQuery($query)->loadResult() === 0)
|
||||||
|
{
|
||||||
|
$label = trim((string) $file);
|
||||||
|
$missing[] = $label !== '' ? preg_replace('/\.zip$/i', '', $label) : $id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return $missing;
|
||||||
|
}
|
||||||
|
catch (\Throwable $e)
|
||||||
|
{
|
||||||
|
// Fail open — never fake a failure on a glitch.
|
||||||
|
return [];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user