Article module: Improve bugfix from previous PR (#1113)

IlchCMS · Nov 17, 2024 · 2da7c3d · 2da7c3d
1 parent 4faefe8
commit 2da7c3d
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/application/modules/article/controllers/admin/Index.php b/application/modules/article/controllers/admin/Index.php
@@ -187,9 +187,22 @@ public function treatAction()
                 ->to($redirect);
         }
 
-        if ($this->getRequest()->getParam('id') && is_numeric($this->getRequest()->getParam('id'))) {
+        if ($this->getRequest()->getParam('id')) {
+            if (!is_numeric($this->getRequest()->getParam('id'))) {
+                $this->redirect()
+                    ->withMessage('articleNotFound', 'danger')
+                    ->to(['action' => 'index']);
+            }
+
             $article = $articleMapper->getArticleByIdLocale($this->getRequest()->getParam('id'));
-            $groups = explode(',', $article ? $article->getReadAccess() : [1,2,3]);
+
+            if (!$article) {
+                $this->redirect()
+                    ->withMessage('articleNotFound', 'danger')
+                    ->to(['action' => 'index']);
+            }
+
+            $groups = explode(',', $article->getReadAccess());
         } else {
             $groups = [1,2,3];
         }

diff --git a/application/modules/article/translations/de.php b/application/modules/article/translations/de.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Ilch 2.0
+ * @copyright Ilch 2
  * @package ilch
  */
 
@@ -62,4 +62,5 @@
     'unknownKeyword' => 'Keyword nicht vorhanden',
     'clock' => 'Uhr',
     'rssDesc' => 'Alle Neuigkeiten von %s',
+    'articleNotFound' => 'Artikel nicht gefunden.',
 ];
diff --git a/application/modules/article/translations/en.php b/application/modules/article/translations/en.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Ilch 2.0
+ * @copyright Ilch 2
  * @package ilch
  */
 
@@ -62,4 +62,5 @@
     'unknownKeyword' => 'Keyword not existing',
     'clock' => 'o\'clock',
     'rssDesc' => 'All articles from %s',
+    'articleNotFound' => 'Article not found.',
 ];