From c09c7ecfa3a10a59fc1ac15b70c583b79eb5afa0 Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 17:41:41 +0200 Subject: [PATCH 01/10] Update showArticle-controller.php --- php/controller/showArticle-controller.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/php/controller/showArticle-controller.php b/php/controller/showArticle-controller.php index 61c6f99..fcd240a 100644 --- a/php/controller/showArticle-controller.php +++ b/php/controller/showArticle-controller.php @@ -5,6 +5,7 @@ if (session_status() === PHP_SESSION_NONE) { require_once 'php/model/Article.php'; require_once 'php/model/ArticleManager.php'; +require_once 'php/model/UserManager.php'; require_once 'php/model/CommentManager.php'; if (isset($_GET["id"]) && !empty($_GET["id"])){ @@ -19,6 +20,9 @@ if (isset($_GET["id"]) && !empty($_GET["id"])){ $author = $article->getAuthor(); $tags = $article->getTags(); $articleObj = $article; // Objekt für die Like-Abfagen sichern + + $userManager = UserManager::getInstance(); + $name = $userManager->findUser($author)["vorname"]; }else{ //header("location: index.php?pfad=404"); include_once "content/404.php"; -- 2.47.3 From 74cbc60cbe6e934b53b47347aad1e577aeb6c7ba Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 17:41:42 +0200 Subject: [PATCH 02/10] Update showArticle.php --- content/showArticle.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/showArticle.php b/content/showArticle.php index cd01df6..aea506c 100644 --- a/content/showArticle.php +++ b/content/showArticle.php @@ -45,8 +45,8 @@ include_once 'php/controller/showArticle-controller.php';
- - Von: + + Von:
-- 2.47.3 From 55695f3f825b8e5ded647459d4d17fa25a6be4ae Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 17:42:18 +0200 Subject: [PATCH 03/10] Update showArticle-controller.php --- php/controller/showArticle-controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/controller/showArticle-controller.php b/php/controller/showArticle-controller.php index fcd240a..676f812 100644 --- a/php/controller/showArticle-controller.php +++ b/php/controller/showArticle-controller.php @@ -22,7 +22,7 @@ if (isset($_GET["id"]) && !empty($_GET["id"])){ $articleObj = $article; // Objekt für die Like-Abfagen sichern $userManager = UserManager::getInstance(); - $name = $userManager->findUser($author)["vorname"]; + $name = $userManager->findUser($author)["vorname"]." ".$userManager->findUser($author)["nachname"]; }else{ //header("location: index.php?pfad=404"); include_once "content/404.php"; -- 2.47.3 From bad0c08e6f2945f2c281f09a43dc6f543bbff3e2 Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 17:51:58 +0200 Subject: [PATCH 04/10] Update search-results-controller.php --- php/controller/search-results-controller.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/php/controller/search-results-controller.php b/php/controller/search-results-controller.php index 9907a69..5e6d125 100644 --- a/php/controller/search-results-controller.php +++ b/php/controller/search-results-controller.php @@ -2,8 +2,8 @@ if (session_status() === PHP_SESSION_NONE) { session_start(); } -require_once '../model/LocalArticleManager.php'; require_once '../model/ArticleManager.php'; +require_once '../model/UserManager.php'; require_once '../model/Article.php'; require_once '../validator/search-validator.php'; @@ -18,6 +18,7 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) { try { $articleManager = ArticleManager::getInstance(); + $userManager = UserManager::getInstance(); $results = $articleManager->search($search); @@ -52,7 +53,7 @@ if ($_SERVER["REQUEST_METHOD"] === "GET" && isset($_GET["q"])) { "id" => $obj->getId(), "title" => $obj->getTitle(), "content" => $obj->getContent(), - "author" => $obj->getAuthor(), + "author" => $userManager->findUser($obj->getAuthor())["vorname"] . " " . $userManager->findUser($obj->getAuthor())["nachname"], "category" => $obj->getCategory(), "tags" => $obj->getTags(), "creationDate" => $obj->getCreationDate(), -- 2.47.3 From 8be6e6d61c086f461b27be416d9c67e502dbf650 Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 17:55:37 +0200 Subject: [PATCH 05/10] Update showCategory-controller.php --- php/controller/showCategory-controller.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/php/controller/showCategory-controller.php b/php/controller/showCategory-controller.php index df2f1ca..aee1114 100644 --- a/php/controller/showCategory-controller.php +++ b/php/controller/showCategory-controller.php @@ -19,7 +19,11 @@ if (isset($_GET["category"]) && !empty($_GET["category"]) && articleCategoryVali try { $articleManager = ArticleManager::getInstance(); + $userManager = UserManager::getInstance(); $allArticles = $articleManager->getArticlesByCategory($category); + foreach ($allArticles as $article) { + $article->setAuthor($userManager->findUser($article->getAuthor())["vorname"]) . " " . $userManager->findUser($article->getAuthor())["nachname"]; + } $totalArticles = count($allArticles); // --- SORTIERUNG LOGIK --- -- 2.47.3 From 8f8b25249c7880e5538def3062649fa93b67e10c Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 17:56:31 +0200 Subject: [PATCH 06/10] Update showCategory-controller.php --- php/controller/showCategory-controller.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php/controller/showCategory-controller.php b/php/controller/showCategory-controller.php index aee1114..1f20f34 100644 --- a/php/controller/showCategory-controller.php +++ b/php/controller/showCategory-controller.php @@ -5,6 +5,7 @@ if (session_status() === PHP_SESSION_NONE) { require_once 'php/model/Article.php'; require_once 'php/model/ArticleManager.php'; +require_once 'php/model/UserManager.php'; require_once 'php/validator/article-validator.php'; if (isset($_GET["category"]) && !empty($_GET["category"]) && articleCategoryValidator($_GET["category"])){ -- 2.47.3 From 2ec1b70c91ba8937546ad0ecef2358c72cc404f4 Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 17:59:17 +0200 Subject: [PATCH 07/10] Update Article.php --- php/model/Article.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/php/model/Article.php b/php/model/Article.php index a0e1b65..a553c43 100644 --- a/php/model/Article.php +++ b/php/model/Article.php @@ -97,6 +97,16 @@ class Article return $this->author; } + /** + * Setzt einen neuen Autor eines Beitrages. + * @param string $author + * @return void + */ + public function setAuthor(string $author) + { + $this->author = $author; + } + /** * Gibt das Veröffentlichungsdatum des Beitrags zurück. * @return string -- 2.47.3 From 31585511d09279f51f613622e859e6f322d1c824 Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 18:01:59 +0200 Subject: [PATCH 08/10] Update showCategory-controller.php --- php/controller/showCategory-controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/controller/showCategory-controller.php b/php/controller/showCategory-controller.php index 1f20f34..938fca0 100644 --- a/php/controller/showCategory-controller.php +++ b/php/controller/showCategory-controller.php @@ -23,7 +23,7 @@ if (isset($_GET["category"]) && !empty($_GET["category"]) && articleCategoryVali $userManager = UserManager::getInstance(); $allArticles = $articleManager->getArticlesByCategory($category); foreach ($allArticles as $article) { - $article->setAuthor($userManager->findUser($article->getAuthor())["vorname"]) . " " . $userManager->findUser($article->getAuthor())["nachname"]; + $article->setAuthor($userManager->findUser($article->getAuthor())["vorname"] . " " . $userManager->findUser($article->getAuthor())["nachname"]); } $totalArticles = count($allArticles); -- 2.47.3 From 5d8239822a2beb039a652f03ae344667e1e5cec7 Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 18:04:03 +0200 Subject: [PATCH 09/10] Update showCategory.php --- content/showCategory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/showCategory.php b/content/showCategory.php index 89aa42a..b3ac056 100644 --- a/content/showCategory.php +++ b/content/showCategory.php @@ -58,7 +58,7 @@ $currentPage = isset($page) ? $page : 1;

- + getTitle())) ? htmlspecialchars($article->getTitle()) : 'Kein Titel'; ?>

-- 2.47.3 From 59eeb05e4b2d5798e87cdf13226058d7c10397b4 Mon Sep 17 00:00:00 2001 From: NOrtmann1 Date: Fri, 17 Jul 2026 18:05:33 +0200 Subject: [PATCH 10/10] Update showCategory.php --- content/showCategory.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/content/showCategory.php b/content/showCategory.php index b3ac056..7b83df5 100644 --- a/content/showCategory.php +++ b/content/showCategory.php @@ -71,10 +71,7 @@ $currentPage = isset($page) ? $page : 1; ❤️ getLikes())) ? htmlspecialchars($article->getLikes()) : '0'; ?>
- -

- getContent())) ? htmlspecialchars($article->getContent()) : 'Kein Inhalt'; ?> -

+
→
-- 2.47.3