Merge pull request #1581 from craftcms/bugfix/settings-only-for-admins-and-with-allowAdminChanges

Settings pages are only for admins and when `allowAdminChanges` is true

Author: angrybrad

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Feed Me
 
+## Unreleased
+
+- Feed Me settings are now only available when `allowAdminChanges` are set to `true`. ([#1581](https://github.com/craftcms/feed-me/pull/1581))
+
 ## 5.9.0 - 2024-11-26
 
 - Added the `assetDownloadGuzzle` config setting which defaults to `false`. When it is set to `true`, Feed Me will use Guzzle to download assets instead curl directly. ([#1549](https://github.com/craftcms/feed-me/pull/1549))

docs/.vitepress/utils.js

@@ -7,7 +7,7 @@ function renderInlineCode(tokens, idx, options, env, renderer) {
   var token = tokens[idx];
 
   return `<code v-pre ${renderer.renderAttrs(token)}>${escapeHtml(
-    tokens[idx].content,
+    tokens[idx].content
   )}</code>`;
 }
 

src/Plugin.php

@@ -155,6 +155,7 @@ private function _registerCpRoutes(): void
                 'feed-me/feeds/run/<feedId:\d+>' => 'feed-me/feeds/run-feed',
                 'feed-me/feeds/status/<feedId:\d+>' => 'feed-me/feeds/status-feed',
                 'feed-me/logs' => 'feed-me/logs/logs',
+                'feed-me/utilities' => ['template' => 'feed-me/utilities/index'],
                 'feed-me/settings/general' => 'feed-me/base/settings',
             ]);
         });

src/controllers/BaseController.php

@@ -23,6 +23,8 @@ class BaseController extends Controller
      */
     public function actionSettings(): Response
     {
+        $this->requireAdmin();
+
         $settings = Plugin::$plugin->getSettings();
 
         return $this->renderTemplate('feed-me/settings/general', [
@@ -41,6 +43,6 @@ public function actionClearTasks(): Response
             ->delete('{{%queue}}')
             ->execute();
 
-        return $this->redirect('feed-me/settings/general');
+        return $this->redirect('feed-me/utilities');
     }
 }

src/templates/settings/general.html

@@ -1,3 +1,5 @@
+{% requireAdmin %}
+
 {% extends 'feed-me/_layouts/settings' %}
 
 {% import '_includes/forms' as forms %}
@@ -38,18 +40,13 @@
         options: {
             'feeds': 'Feeds'|t('feed-me'),
             'logs': 'Logs'|t('feed-me'),
+            'utilities': 'Utilities'|t('feed-me'),
             'settings': 'Settings'|t('feed-me'),
         },
         values: settings.enabledTabs,
         instructions: 'Choose which tabs you would like to be shown.'|t('feed-me'),
     }) }}
 
-    <hr>
-
-    <a class="btn" href="{{ actionUrl('feed-me/base/clear-tasks') }}">
-        {{ "Clear pending job queue"|t('feed-me') }}
-    </a>
-
     {% endnamespace %}
 
     {{ parent() }}

src/templates/utilities/index.html

@@ -0,0 +1,14 @@
+{% extends 'feed-me/_layouts' %}
+
+{% set crumbs = [
+    { label: craft.feedme.getPluginName|t('feed-me'), url: url('feed-me') },
+    { label: "Utilities"|t('feed-me'), url: url('feed-me/utilities') }
+] %}
+
+{% set selectedTab = 'utilities' %}
+
+{% block content %}
+    <a class="btn" href="{{ actionUrl('feed-me/base/clear-tasks') }}">
+        {{ "Clear pending job queue"|t('feed-me') }}
+    </a>
+{% endblock %}

src/web/twig/variables/FeedMeVariable.php

@@ -58,9 +58,13 @@ public function getTabs(): array
         $tabs = [
             'feeds' => ['label' => Craft::t('feed-me', 'Feeds'), 'url' => UrlHelper::cpUrl('feed-me/feeds')],
             'logs' => ['label' => Craft::t('feed-me', 'Logs'), 'url' => UrlHelper::cpUrl('feed-me/logs')],
-            'settings' => ['label' => Craft::t('feed-me', 'Settings'), 'url' => UrlHelper::cpUrl('feed-me/settings')],
+            'utilities' => ['label' => Craft::t('feed-me', 'Utilities'), 'url' => UrlHelper::cpUrl('feed-me/utilities')],
         ];
 
+        if (Craft::$app->getUser()->getIsAdmin() && Craft::$app->getConfig()->getGeneral()->allowAdminChanges) {
+            $tabs['settings'] = ['label' => Craft::t('feed-me', 'Settings'), 'url' => UrlHelper::cpUrl('feed-me/settings')];
+        }
+
         if (!is_array($enabledTabs)) {
             return $tabs;
         }