Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 niklas.ortmann
|
35d4425086 | ||
|
niklas.ortmann
|
d3435d4cde | ||
|
niklas.ortmann
|
f61c548b9e | ||
|
niklas.ortmann
|
101a2a247b | ||
|
niklas.ortmann
|
423941e7ed | ||
|
niklas.ortmann
|
a8e76c782d | ||
|
niklas.ortmann
|
3f9c048493 | ||
|
niklas.ortmann
|
fee5a701df | ||
|
niklas.ortmann
|
d341312192 | ||
|
niklas.ortmann
|
4dadfb8863 | ||
|
niklas.ortmann
|
0b4c5f988d | ||
|
niklas.ortmann
|
59eeb05e4b | ||
|
niklas.ortmann
|
5d8239822a | ||
|
niklas.ortmann
|
31585511d0 | ||
|
niklas.ortmann
|
2ec1b70c91 | ||
|
niklas.ortmann
|
8f8b25249c | ||
|
niklas.ortmann
|
8be6e6d61c | ||
|
niklas.ortmann
|
bad0c08e6f | ||
|
niklas.ortmann
|
55695f3f82 | ||
|
niklas.ortmann
|
74cbc60cbe | ||
|
niklas.ortmann
|
c09c7ecfa3 |
@@ -45,8 +45,8 @@ include_once 'php/controller/showArticle-controller.php';
|
||||
</h1>
|
||||
|
||||
<div class="article-view-meta">
|
||||
<?php if (isset($author) && !empty($author)): ?>
|
||||
<span class="article-view-author">Von: <strong><?php echo htmlspecialchars($author); ?></strong></span>
|
||||
<?php if (isset($name) && !empty($name)): ?>
|
||||
<span class="article-view-author">Von: <strong><?php echo htmlspecialchars($name); ?></strong></span>
|
||||
<?php endif; ?>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ $currentPage = isset($page) ? $page : 1;
|
||||
<div class="cat-view-item">
|
||||
<div class="cat-view-content">
|
||||
<h2 class="cat-view-item-title">
|
||||
<a href="#" class="cat-view-link">
|
||||
<a href="index.php?pfad=showArticle&id=<?php echo htmlspecialchars($article->getID()); ?>" class="cat-view-link">
|
||||
<?php echo (isset($article) && !empty($article->getTitle())) ? htmlspecialchars($article->getTitle()) : 'Kein Titel'; ?>
|
||||
</a>
|
||||
</h2>
|
||||
@@ -72,9 +72,6 @@ $currentPage = isset($page) ? $page : 1;
|
||||
</span>
|
||||
</div>
|
||||
|
||||
<p style="margin: 0; color: #4a5568;">
|
||||
<?php echo (isset($article) && !empty($article->getContent())) ? htmlspecialchars($article->getContent()) : 'Kein Inhalt'; ?>
|
||||
</p>
|
||||
</div>
|
||||
<div class="cat-view-arrow">→</div>
|
||||
</div>
|
||||
|
||||
@@ -2,52 +2,10 @@
|
||||
if (session_status() === PHP_SESSION_NONE) {
|
||||
session_start();
|
||||
}
|
||||
ob_start();
|
||||
include_once("php/controller/index.php");
|
||||
|
||||
$pfad = $_GET["pfad"] ?? "home";
|
||||
|
||||
/*
|
||||
Controller für Aktionen werden vor der HTML-Ausgabe geladen,
|
||||
damit Weiterleitungen mit header() funktionieren.
|
||||
*/
|
||||
if ($pfad === "login") {
|
||||
include_once "php/controller/login-controller.php";
|
||||
}
|
||||
|
||||
if ($pfad === "register") {
|
||||
include_once "php/controller/register-controller.php";
|
||||
}
|
||||
if ($pfad === "password-forgotten") {
|
||||
include_once "php/controller/password-forgotten-controller.php";
|
||||
}
|
||||
|
||||
if ($pfad === "confirm-register") {
|
||||
include_once "php/controller/confirm-register-controller.php";
|
||||
}
|
||||
|
||||
if ($pfad === "confirm-password") {
|
||||
include_once "php/controller/confirm-password-controller.php";
|
||||
}
|
||||
|
||||
if ($pfad === "logout") {
|
||||
include_once "php/controller/logout-controller.php";
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($pfad === "deleteAccount") {
|
||||
include_once "php/controller/deleteAccount-controller.php";
|
||||
exit();
|
||||
}
|
||||
include_once "php/controller/index-controller.php";
|
||||
?>
|
||||
|
||||
<!--
|
||||
Seite: Index der Lernplattform
|
||||
Funktion: Webseitengerüst, Anzeigen von Content
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="description" content="EduForge">
|
||||
@@ -73,17 +31,13 @@ if ($pfad === "deleteAccount") {
|
||||
|
||||
<title>EduForge</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<?php
|
||||
include_once 'includes/navbar.php';
|
||||
|
||||
/*
|
||||
Dynamischer Inhalt:
|
||||
Je nach pfad-Parameter wird die passende Datei aus content geladen.
|
||||
*/
|
||||
if (file_exists('content/' . $pfad . '.php')) {
|
||||
// Dynamischer Inhalt
|
||||
if (isset($pfad) && $pfad !== "404" && file_exists('content/' . $pfad . '.php')) {
|
||||
include_once 'content/' . $pfad . '.php';
|
||||
} else {
|
||||
include_once 'content/404.php';
|
||||
@@ -94,7 +48,3 @@ if ($pfad === "deleteAccount") {
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
<?php
|
||||
ob_end_flush();
|
||||
?>
|
||||
@@ -1,3 +1,35 @@
|
||||
<?php
|
||||
// Standardpfad
|
||||
$pfad = $_GET["pfad"] ?? "home";
|
||||
|
||||
?>
|
||||
if ($pfad === "logout") {
|
||||
include_once "php/controller/logout-controller.php";
|
||||
exit();
|
||||
} elseif ($pfad === "deleteAccount") {
|
||||
include_once "php/controller/deleteAccount-controller.php";
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($pfad === "login") {
|
||||
include_once "php/controller/login-controller.php";
|
||||
} elseif ($pfad === "register") {
|
||||
include_once "php/controller/register-controller.php";
|
||||
} elseif ($pfad === "password-forgotten") {
|
||||
include_once "php/controller/password-forgotten-controller.php";
|
||||
} elseif ($pfad === "confirm-register") {
|
||||
include_once "php/controller/confirm-register-controller.php";
|
||||
} elseif ($pfad === "confirm-password") {
|
||||
include_once "php/controller/confirm-password-controller.php";
|
||||
}
|
||||
|
||||
// Whitelist
|
||||
$erlaubte_content_seiten = [
|
||||
"accessibility", "confirm-password", "confirm-register", "createArticle",
|
||||
"datenschutz", "home", "impressum", "login", "nutzungsbedingungen",
|
||||
"password-forgotten", "profile", "register", "search-results",
|
||||
"show-mail", "showArticle", "showCategory", "updateArticle"
|
||||
];
|
||||
|
||||
if (!in_array($pfad, $erlaubte_content_seiten)) {
|
||||
$pfad = "404";
|
||||
}
|
||||
|
||||
@@ -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(),
|
||||
|
||||
@@ -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"]." ".$userManager->findUser($author)["nachname"];
|
||||
}else{
|
||||
//header("location: index.php?pfad=404");
|
||||
include_once "content/404.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"])){
|
||||
@@ -19,7 +20,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 ---
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user