Merge branch 'release/5.1.18' into v5

Author: khalwat

CHANGELOG.md

@@ -1,5 +1,19 @@
 # SEOmatic Changelog
 
+## 5.1.18 - 2025.10.06
+### Added
+* Added a `twigExtensionClasses` config setting to allow additional TwigExtension classes to be loaded in the Twig `SandboxView` that SEOmatic uses to render ([#1632](https://github.com/nystudio107/craft-seomatic/issues/1632))
+* Only allow users to pick SEO/Facebook/Twitter images from asset volumes that they had permission to access ([#1650](https://github.com/nystudio107/craft-seomatic/issues/1650))
+
+### Changed
+* No longer block various AI bots via `robots.txt` by default ([#1635](https://github.com/nystudio107/craft-seomatic/issues/1635))
+* Handle setting the focal point for social images that are transformed ([#1626](https://github.com/nystudio107/craft-seomatic/issues/1626))
+
+### Fixed
+* Fixed an issue with page footer text being untranslatable on 3 pages due to filter ordering ([#1651](https://github.com/nystudio107/craft-seomatic/issues/1651))
+* Fixed an issue where sitemap generation could fail with the new Content Block fields under certain conditions ([#1645](https://github.com/nystudio107/craft-seomatic/issues/1645))
+* Don't overwrite the `dataLayer` if it already exists in the Google Tag Manager default script ([#1642](https://github.com/nystudio107/craft-seomatic/issues/1642))
+
 ## 5.1.17 - 2025.08.17
 ### Added
 * Added the ability to choose from nested fields in Content Block fields from the SEOmatic GUI in the various Content SEO settings

buildchain/package-lock.json

@@ -2,7 +2,7 @@
   "name": "nystudio107/craft-seomatic",
   "description": "SEOmatic facilitates modern SEO best practices & implementation for Craft CMS 5. It is a turnkey SEO system that is comprehensive, powerful, and flexible.",
   "type": "craft-plugin",
-  "version": "5.1.17",
+  "version": "5.1.18",
   "minimum-stability": "dev",
   "prefer-stable": true,
   "keywords": [
@@ -38,7 +38,7 @@
     "craftcms/cms": "^5.0.0",
     "nystudio107/craft-plugin-vite": "^5.0.0",
     "nystudio107/craft-code-editor": "^1.0.14",
-    "nystudio107/craft-twig-sandbox": "^5.0.3",
+    "nystudio107/craft-twig-sandbox": "^5.0.5",
     "php-science/textrank": "^1.0.3",
     "davechild/textstatistics": "^1.0.3",
     "sunra/php-simple-html-dom-parser": "^1.5.2"

composer.json

@@ -428,6 +428,12 @@ protected function installEventListeners(): void
             $seomaticTwigExtension = new SeomaticTwigExtension();
             self::$view->registerTwigExtension($seomaticTwigExtension);
             self::$sandboxView->registerTwigExtension($seomaticTwigExtension);
+            // Register the additional TwigExtension classes
+            foreach (Seomatic::$settings->twigExtensionClasses as $className) {
+                if (class_exists($className)) {
+                    self::$sandboxView->registerTwigExtension(new $className());
+                }
+            }
             $request = Craft::$app->getRequest();
             // Add in our event listeners that are needed for every request
             $this->installGlobalEventListeners();

docs/package-lock.json

@@ -174,4 +174,7 @@
     // string[] URL params that are allowed to be considered part of the unique URL used for the metadata cache
     'allowedUrlParams' => [
     ],
+    // class-string[] Array of TwigExtension classes to instantiate and add to the SandboxView
+    'twigExtensionClasses' => [
+    ],
 ];

src/Seomatic.php

@@ -25,6 +25,7 @@
 use nystudio107\seomatic\autocompletes\TrackingVarsAutocomplete;
 use nystudio107\seomatic\base\SeoElementInterface;
 use nystudio107\seomatic\helpers\ArrayHelper;
+use nystudio107\seomatic\helpers\AssetHelper;
 use nystudio107\seomatic\helpers\DynamicMeta as DynamicMetaHelper;
 use nystudio107\seomatic\helpers\Field as FieldHelper;
 use nystudio107\seomatic\helpers\ImageTransform as ImageTransformHelper;
@@ -326,6 +327,7 @@ public function actionGlobal(string $subSection = 'general', string $siteHandle
             // Image selectors
             $bundleSettings = $metaBundle->metaBundleSettings;
             $variables['elementType'] = Asset::class;
+            $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
             $variables['seoImageElements'] = ImageTransformHelper::assetElementsFromIds(
                 $bundleSettings->seoImageIds,
                 $siteId
@@ -629,6 +631,7 @@ public function actionEditContent(
         $variables['currentSubSection'] = $subSection;
         $bundleSettings = $metaBundle->metaBundleSettings;
         $variables['elementType'] = Asset::class;
+        $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
         $variables['seoImageElements'] = ImageTransformHelper::assetElementsFromIds(
             $bundleSettings->seoImageIds,
             $siteId
@@ -809,6 +812,7 @@ public function actionSite(string $subSection = 'identity', string $siteHandle =
             );
         }
         $variables['elementType'] = Asset::class;
+        $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
         $this->setCrumbVariables($variables);
 
         // Render the template

src/config.php

@@ -19,6 +19,7 @@
 use craft\helpers\StringHelper;
 use nystudio107\seomatic\assetbundles\seomatic\SeomaticAsset;
 use nystudio107\seomatic\helpers\ArrayHelper;
+use nystudio107\seomatic\helpers\AssetHelper;
 use nystudio107\seomatic\helpers\Config as ConfigHelper;
 use nystudio107\seomatic\helpers\Field as FieldHelper;
 use nystudio107\seomatic\helpers\Migration as MigrationHelper;
@@ -364,7 +365,7 @@ public function getInputHtml(mixed $value, ?ElementInterface $element = null): s
 
         /** @var MetaBundle $value */
         $variables['elementType'] = Asset::class;
-
+        $variables['assetVolumeSources'] = AssetHelper::getAssetInputSources();
         $variables['parentBundles'] = [];
         // Preview the containers so the preview is correct in the field
         if ($element !== null && $element->uri !== null) {

src/controllers/SettingsController.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * SEOmatic plugin for Craft CMS
+ *
+ * A turnkey SEO implementation for Craft CMS that is comprehensive, powerful,
+ * and flexible
+ *
+ * @link      https://nystudio107.com
+ * @copyright Copyright (c) nystudio107
+ */
+
+namespace nystudio107\seomatic\helpers;
+
+use Craft;
+use craft\elements\Asset;
+use craft\fs\Temp;
+use craft\helpers\ArrayHelper;
+use craft\services\ElementSources;
+
+/**
+ * @author    nystudio107
+ * @package   Seomatic
+ * @since     5.1.18
+ */
+class AssetHelper
+{
+    /**
+     * Return asset volume sources that can be accessed by the current user
+     *
+     * @return array
+     */
+    public static function getAssetInputSources(): array
+    {
+        $sources = [];
+        foreach (Craft::$app->getElementSources()->getSources(Asset::class) as $source) {
+            if ($source['type'] !== ElementSources::TYPE_HEADING) {
+                $sources[] = $source['key'];
+            }
+        }
+
+        $userService = Craft::$app->getUser();
+        $volumesService = Craft::$app->getVolumes();
+        return ArrayHelper::where($sources, function(string $source) use ($volumesService, $userService) {
+            // If it’s not a volume folder, let it through
+            if (!str_starts_with($source, 'volume:')) {
+                return true;
+            }
+            // Only show it if they have permission to view it, or if it's the temp volume
+            $volumeUid = explode(':', $source)[1];
+            if ($userService->checkPermission("viewAssets:$volumeUid")) {
+                return true;
+            }
+            $volume = $volumesService->getVolumeByUid($volumeUid);
+            return $volume?->getFs() instanceof Temp;
+        }, true, true, false);
+    }
+}

src/fields/SeoSettings.php

@@ -69,7 +69,7 @@ public static function sitemapEagerLoadMap($metaBundle): array
     public static function assetFieldEagerLoadMap($layout, $transform): array
     {
         $fieldMap = [];
-        $assetFields = FieldHelper::fieldsOfTypeFromLayout(FieldHelper::ASSET_FIELD_CLASS_KEY, $layout);
+        $assetFields = FieldHelper::fieldsOfTypeFromLayout(FieldHelper::ASSET_FIELD_CLASS_KEY, $layout, true, null, null, false);
         foreach ($assetFields as $assetFieldHandle) {
             $fieldMap[] = empty($transform) ? $assetFieldHandle : [$assetFieldHandle, ['withTransforms' => $transform]];
         }
@@ -87,7 +87,7 @@ public static function assetFieldEagerLoadMap($layout, $transform): array
     public static function matrixFieldEagerLoadMap($layout, $transform): array
     {
         $fieldMap = [];
-        $matrixFields = FieldHelper::fieldsOfTypeFromLayout(FieldHelper::BLOCK_FIELD_CLASS_KEY, $layout);
+        $matrixFields = FieldHelper::fieldsOfTypeFromLayout(FieldHelper::BLOCK_FIELD_CLASS_KEY, $layout, true, null, null, false);
         foreach ($matrixFields as $matrixFieldHandle) {
             /** @var Matrix $matrixField */
             $matrixField = $layout->getFieldByHandle($matrixFieldHandle);
@@ -103,7 +103,7 @@ public static function matrixFieldEagerLoadMap($layout, $transform): array
             if ($entryTypes) {
                 foreach ($entryTypes as $entryType) {
                     $matrixLayout = $entryType->getFieldLayout();
-                    $assetFields = FieldHelper::fieldsOfTypeFromLayout(FieldHelper::ASSET_FIELD_CLASS_KEY, $matrixLayout);
+                    $assetFields = FieldHelper::fieldsOfTypeFromLayout(FieldHelper::ASSET_FIELD_CLASS_KEY, $matrixLayout, true, null, null, false);
                     foreach ($assetFields as $assetFieldHandle) {
                         $fieldMap[] = empty($transform) ? "$matrixFieldHandle.$assetFieldHandle" : ["$matrixFieldHandle.$assetFieldHandle", ['withTransforms' => $transform]];
                     }