Compare commits
81 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1314362df9 | |||
| 5a1c032f1b | |||
| fae4bc86ad | |||
| 664092d52f | |||
| 22b1dd827d | |||
| 50df844e23 | |||
| 45b6b41d60 | |||
| a0a79e0191 | |||
| bfc9ee4d01 | |||
| 92574a0f76 | |||
| ade73f3105 | |||
| ee75620cd8 | |||
| 94486e2b0a | |||
| a26e985edf | |||
| cf9ac795eb | |||
| a519387773 | |||
| ed40596389 | |||
| 4c855c05ed | |||
| e7189245d5 | |||
| 709a4ba83c | |||
| fb54ba2462 | |||
| c6b55030cf | |||
| af04557f58 | |||
| 2c100bddf2 | |||
| 5c7a47e002 | |||
| bbaa73dc1a | |||
| 9f5806f019 | |||
| 6de86c3143 | |||
| c9c0de6c3c | |||
| 4f827ed3a8 | |||
| aedac79743 | |||
| 84a39bf0d4 | |||
| 75c6d099f5 | |||
| 319957c01e | |||
| 26dc33ea2f | |||
| 7597eddd7c | |||
| 0441b4e56f | |||
| cbff21136c | |||
| 03f0d19b01 | |||
| ca65c6c6e1 | |||
| 2b095f16bf | |||
| 930bf99fa1 | |||
| 366527e8e9 | |||
| 4e06240307 | |||
| 38608a5278 | |||
| b19f30cca4 | |||
| b206e809ac | |||
| e88f741fa7 | |||
| 6958e71bfb | |||
| c6ad0b2a59 | |||
| da9ea4f413 | |||
| 5703c0a6dd | |||
| b70943dd35 | |||
| 0f7099be81 | |||
| 9cbc1637b4 | |||
| d01be7d84c | |||
| 28511e0cc4 | |||
| 3774a2caee | |||
| 70277d3712 | |||
| 18cb092d06 | |||
| 417f34e35f | |||
| c62ff5b2c0 | |||
| ad422a134d | |||
| 9fce9ec8dd | |||
| a329137de2 | |||
| 62a7b6773c | |||
| 21bdb0d66d | |||
| 5db4ad3e63 | |||
| 2ce13cef72 | |||
| 02551049e0 | |||
| 55e9fa6a20 | |||
| c82378baa8 | |||
| 541d5b4c5e | |||
| f9ab3f8db2 | |||
| 6c5047be30 | |||
| 25f6d2bf4a | |||
| 4d8f338649 | |||
| 46a307a5b0 | |||
| 7706c7dfbf | |||
| a946cee891 | |||
| 4d4b8aeb99 |
Generated
+1
-3
@@ -10,9 +10,7 @@
|
||||
<option name="highlightLevel" value="WARNING" />
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="7.0">
|
||||
<option name="suggestChangeDefaultLanguageLevel" value="false" />
|
||||
</component>
|
||||
<component name="PhpProjectSharedConfiguration" php_language_level="8.5" />
|
||||
<component name="PhpStanOptionsConfiguration">
|
||||
<option name="transferred" value="true" />
|
||||
</component>
|
||||
|
||||
@@ -1,13 +1,25 @@
|
||||
Team Tag-Buchstabe: DI-14-C-Schulte-Eilers-Ortmann
|
||||
Namen der Studierenden:
|
||||
- Name 1 Caroline Schulte
|
||||
- Name 2 Jacques Eilers
|
||||
- Name 3 Niklas Ortmann
|
||||
Abgabe zu Aufgabenblatt 1
|
||||
# Webprogrammierung: Gruppe DI-14-C
|
||||
|
||||
Hinweise:
|
||||
index.html wurde zu einer index.php umbenannt.
|
||||
webhook.php bitte ignorieren. Diese dient nur als zukünftige Automatisierung des Repo-Pulls (s. https://docs.gitea.com/usage/webhooks)
|
||||
## Beteiligte
|
||||
- Caroline Schulte
|
||||
- Jacques Eilers
|
||||
- Niklas Ortmann
|
||||
|
||||
Beim Verwenden der Navbar-Links bitte Folgendes beachten: nur die Kategorien Physik, Mathe, Informatik führen exemplarisch auf eine Beispiel-Seite.
|
||||
Die anderen Links sind erstmal Platzhalter, dessen dynamischer Inhalt später mit PHP in die index.php eingefügt wird. Alle anderen Links führen auf eine 404-Seite.
|
||||
## Login-Informationen für Dummy-User
|
||||
Jeweils im Format `Anmeldename, Passwort, Mailadresse`:
|
||||
- `max.mustermann, test123, mustermann@web.de`
|
||||
|
||||
## Weitere Voraussetzungen zur Nutzung
|
||||
|
||||
## Ausgelassene Teilaufgaben
|
||||
|
||||
## Bekannte Fehler und Mängel
|
||||
- Der Beitragseditor fügt beim Laden von Inhalten leere Zeichen ein.
|
||||
- Bitte auf die gesetzten TODO's achten. Wenn Inhalte fehlen, sind sie i.d.R. als TODO kommentiert.
|
||||
|
||||
## Besonderheiten des Projektes
|
||||
- Es wurde ein einfacher Beitrags-Editor erstellt. Mit diesem können Beiträge erstellt oder bearbeitet werden.
|
||||
Es handelt es sich um eine einfache Version. Später sollen z.B. Bilder und die Positionierung der Elemente folgen.
|
||||
- Es sind drei Dummy-Beiträge für den Nutzer max.mustermann hinterlegt.
|
||||
- Beim Verwenden der Navbar-Links bitte Folgendes beachten: nur die Kategorien Physik, Mathe, Informatik führen exemplarisch auf eine Beispiel-Seite.
|
||||
Die anderen Links sind erstmal Platzhalter und führen auf eine 404-Seite.
|
||||
|
||||
@@ -1,5 +1,9 @@
|
||||
<?php
|
||||
session_start();
|
||||
$user = $user ?? null;
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
exit();
|
||||
}
|
||||
?>
|
||||
<!--
|
||||
Seite: Beitrag erstellen
|
||||
@@ -58,7 +62,7 @@ session_start();
|
||||
<aside class="editor-sidebar">
|
||||
|
||||
<div class="sidebar-block">
|
||||
<button type="submit" class="btn-publish">Veröffentlichen</button>
|
||||
<button type="submit" id="editor-button" class="button">Veröffentlichen</button>
|
||||
</div>
|
||||
|
||||
<div class="sidebar-block">
|
||||
|
||||
@@ -0,0 +1,19 @@
|
||||
<?php
|
||||
require_once "php/model/LocalUserDAO.php";
|
||||
|
||||
$dao = new LocalUserDAO();
|
||||
|
||||
/*
|
||||
Deregistrierung
|
||||
Funktion: Entfernt User aus Dummy-Daten und beendet Session
|
||||
*/
|
||||
|
||||
if (isset($_SESSION["user_email"])) {
|
||||
$dao->deleteUser($_SESSION["user_email"]);
|
||||
}
|
||||
|
||||
$_SESSION = [];
|
||||
session_destroy();
|
||||
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
+34
-13
@@ -1,32 +1,53 @@
|
||||
<?php
|
||||
$error = $error ?? null;
|
||||
?>
|
||||
|
||||
<!--
|
||||
Form: Login-Bereich
|
||||
Funktion: Benutzerauthentifizierung und Zugang zum eigenen Profil, Erstellen von Beiträgen, etc.
|
||||
-->
|
||||
<main class="login-page">
|
||||
<div class="login-container">
|
||||
|
||||
|
||||
<h1>Bitte anmelden</h1>
|
||||
|
||||
<form>
|
||||
<label id ="inputEmail" class="screenreader-only">E-Mail Adresse / </label>
|
||||
<?php if ($error): ?>
|
||||
<p style="color:red;">
|
||||
<?php echo htmlspecialchars($error); ?>
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
|
||||
<form method="post" action="index.php?pfad=login">
|
||||
|
||||
<p class="input-label">Benutzername/E-Mail-Adresse:</p>
|
||||
<input type="email" name="email" class="login-input" placeholder="E-Mail-Adresse" required autofocus>
|
||||
<input type="email"
|
||||
name="email"
|
||||
class="login-input"
|
||||
placeholder="E-Mail-Adresse"
|
||||
required
|
||||
autofocus>
|
||||
|
||||
<p class="input-label">Passwort:</p>
|
||||
<input type="password" name="password" class="login-input" placeholder="Passwort" required>
|
||||
<input type="password"
|
||||
name="password"
|
||||
class="login-input"
|
||||
placeholder="Passwort"
|
||||
required>
|
||||
|
||||
<div class="checkbox-wrapper">
|
||||
<label>
|
||||
<input type="checkbox" name="remember-me" value="1"> angemeldet bleiben
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<button type="submit" value="anmelden" name="loginSubmit" class="login-button">anmelden</button>
|
||||
<button type="submit"
|
||||
value="anmelden"
|
||||
name="loginSubmit"
|
||||
class="button">
|
||||
anmelden
|
||||
</button>
|
||||
|
||||
<div class="register-link">
|
||||
<a href="register.php">Noch keinen Account? Jetzt hier registrieren!</a>
|
||||
<a href="index.php?pfad=register">
|
||||
Noch keinen Account? Jetzt hier registrieren!
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
@@ -0,0 +1,6 @@
|
||||
<?php
|
||||
$_SESSION = [];
|
||||
session_destroy();
|
||||
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
+116
-37
@@ -1,74 +1,144 @@
|
||||
<!--
|
||||
Content: Profil
|
||||
Inhalt: Das eigene Profil, wenn man angemeldet ist. Dort hat man die Möglichkeit seine Angaben zu ändern.
|
||||
-->
|
||||
<?php
|
||||
include_once 'php/controller/profileArticles-controller.php';
|
||||
include_once 'php/controller/profile-controller.php';
|
||||
|
||||
$user = $user ?? null;
|
||||
$isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
|
||||
?>
|
||||
|
||||
<main class="form-page">
|
||||
<div class="flexbox">
|
||||
<!-- Linke Spalte: Profildaten -->
|
||||
|
||||
<div class="container">
|
||||
<form>
|
||||
|
||||
<?php if (!empty($error)): ?>
|
||||
<p class="alert-message is-error">
|
||||
<?php echo htmlspecialchars($error); ?>
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
|
||||
<form method="post" action="index.php?pfad=profile">
|
||||
|
||||
<label class="input-label">Vorname</label>
|
||||
<input type="text" name="Vorname" class="login-input" required
|
||||
placeholder="Vorname"
|
||||
value="<?php //DB-Daten ?>">
|
||||
<input type="text"
|
||||
name="vorname"
|
||||
class="login-input"
|
||||
value="<?php echo htmlspecialchars($_POST["vorname"] ?? $user["vorname"] ?? ""); ?>"
|
||||
<?php echo $isEditMode ? "" : "readonly"; ?>
|
||||
required>
|
||||
|
||||
<label class="input-label">Nachname</label>
|
||||
<input type="text" name="Nachname" class="login-input" required
|
||||
placeholder="Nachname"
|
||||
value="<?php //DB-Daten ?>">
|
||||
<input type="text"
|
||||
name="nachname"
|
||||
class="login-input"
|
||||
value="<?php echo htmlspecialchars($_POST["nachname"] ?? $user["nachname"] ?? ""); ?>"
|
||||
<?php echo $isEditMode ? "" : "readonly"; ?>
|
||||
required>
|
||||
|
||||
<label class="input-label">Email-Adresse</label>
|
||||
<input type="email" name="Email" class="login-input" required
|
||||
placeholder="mustermann@web.de"
|
||||
value="<?php //DB-Daten ?>">
|
||||
<input type="email"
|
||||
name="email"
|
||||
class="login-input"
|
||||
value="<?php echo htmlspecialchars($_POST["email"] ?? $user["email"] ?? ""); ?>"
|
||||
<?php echo $isEditMode ? "" : "readonly"; ?>
|
||||
required>
|
||||
|
||||
<label class="input-label">Passwort</label>
|
||||
<input type="password" name="Passwort" class="login-input"
|
||||
required placeholder="Passwort">
|
||||
<label class="input-label">
|
||||
<?php echo $isEditMode ? "Neues Passwort" : "Passwort"; ?>
|
||||
</label>
|
||||
|
||||
<button type="submit" class="login-button">
|
||||
Speichern
|
||||
</button>
|
||||
<?php if ($isEditMode): ?>
|
||||
<input type="password"
|
||||
name="password"
|
||||
class="login-input"
|
||||
placeholder="Leer lassen, wenn es gleich bleiben soll">
|
||||
<?php else: ?>
|
||||
<input type="password"
|
||||
name="password"
|
||||
class="login-input"
|
||||
value="********"
|
||||
readonly>
|
||||
<?php endif; ?>
|
||||
|
||||
<br><br>
|
||||
|
||||
<?php if ($isEditMode): ?>
|
||||
<button type="submit"
|
||||
name="saveProfile"
|
||||
class="button">
|
||||
Speichern
|
||||
</button>
|
||||
|
||||
<a href="index.php?pfad=profile" class="button">
|
||||
Abbrechen
|
||||
</a>
|
||||
<?php else: ?>
|
||||
<a href="index.php?pfad=profile&edit=1" class="button">
|
||||
Bearbeiten
|
||||
</a>
|
||||
<?php endif; ?>
|
||||
|
||||
<button type="button" class="login-button delete-account-button">
|
||||
Account löschen
|
||||
</button>
|
||||
</form>
|
||||
|
||||
<br>
|
||||
|
||||
<a href="index.php?pfad=deleteAccount" class="button">
|
||||
Account löschen
|
||||
</a>
|
||||
|
||||
<br><br>
|
||||
|
||||
<a href="index.php?pfad=logout" class="button">
|
||||
Abmelden
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- Rechte Spalte: Eigene Beiträge -->
|
||||
<div class="container">
|
||||
<h2 class="section-title">Meine Beiträge</h2>
|
||||
|
||||
<div class="articles-list">
|
||||
<?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "internal_error"): ?>
|
||||
|
||||
<p class="alert-message is-error">
|
||||
Es ist ein interner Fehler aufgetreten. Bitte versuche es erneut.
|
||||
</p>
|
||||
|
||||
<?php elseif (isset($userArticles) && count($userArticles) > 0): ?>
|
||||
|
||||
<?php foreach ($userArticles as $userArticle): ?>
|
||||
<!-- Ein einzelner Artikel-Eintrag -->
|
||||
<div class="article-item">
|
||||
<div class="article-meta">
|
||||
<span class="article-date"><?php echo htmlspecialchars($userArticle->getCreationDate()); ?></span>
|
||||
<span class="article-category"><?php echo htmlspecialchars($userArticle->getCategory()); ?></span>
|
||||
<span class="article-date">
|
||||
<?php echo htmlspecialchars($userArticle->getCreationDate()); ?>
|
||||
</span>
|
||||
|
||||
<span class="article-category">
|
||||
<?php echo htmlspecialchars($userArticle->getCategory()); ?>
|
||||
</span>
|
||||
</div>
|
||||
<h3 class="article-title"><?php echo htmlspecialchars($userArticle->getTitle()); ?></h3>
|
||||
|
||||
<h3 class="article-title">
|
||||
<?php echo htmlspecialchars($userArticle->getTitle()); ?>
|
||||
</h3>
|
||||
|
||||
<?php
|
||||
$tags = $userArticle->getTags();
|
||||
if (isset($tags) && !empty($tags)): ?>
|
||||
if (isset($tags) && !empty($tags)):
|
||||
?>
|
||||
<div class="article-view-bottom-section">
|
||||
<div class="article-view-tags-label">Tags:</div>
|
||||
|
||||
<div class="article-view-tags-list">
|
||||
<?php
|
||||
$tagArray = is_array($tags) ? $tags : explode(',', $tags);
|
||||
|
||||
foreach ($tagArray as $tag):
|
||||
$trimmedTag = trim($tag);
|
||||
|
||||
if (!empty($trimmedTag)):
|
||||
?>
|
||||
<span class="article-view-tag-item"><?php echo htmlspecialchars($trimmedTag); ?></span>
|
||||
<span class="article-view-tag-item">
|
||||
<?php echo htmlspecialchars($trimmedTag); ?>
|
||||
</span>
|
||||
<?php
|
||||
endif;
|
||||
endforeach;
|
||||
@@ -76,18 +146,27 @@ include_once 'php/controller/profileArticles-controller.php';
|
||||
</div>
|
||||
</div>
|
||||
<?php endif; ?>
|
||||
<a href="index.php?pfad=updateArticle&id=<?php echo $userArticle->getID(); ?>" class="edit-link-button">Bearbeiten</a>
|
||||
|
||||
<a href="index.php?pfad=updateArticle&id=<?php echo $userArticle->getID(); ?>"
|
||||
class="edit-link-button">
|
||||
Bearbeiten
|
||||
</a>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
<?php else: ?>
|
||||
|
||||
<p>Du hast noch keine Beiträge erstellt.</p>
|
||||
<button type="button" class="login-button" onclick="window.location.href='index.php?pfad=createArticle';">
|
||||
|
||||
<button type="button"
|
||||
class="button"
|
||||
onclick="window.location.href='index.php?pfad=createArticle';">
|
||||
Beitrag erstellen!
|
||||
</button>
|
||||
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
unset($_SESSION["message"]);
|
||||
?>
|
||||
|
||||
<?php unset($_SESSION["message"]); ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
+42
-11
@@ -1,3 +1,7 @@
|
||||
<?php
|
||||
$error = $error ?? null;
|
||||
?>
|
||||
|
||||
<!--
|
||||
Form: Registrierung
|
||||
Funktion: Erstellung neuer Benutzerkonten
|
||||
@@ -7,26 +11,53 @@
|
||||
|
||||
<h1>Jetzt Registrieren!</h1>
|
||||
|
||||
<form>
|
||||
<?php if (!empty($error)): ?>
|
||||
<p class="alert-message is-error" style="color:red;">
|
||||
<?php echo htmlspecialchars($error); ?>
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
|
||||
<form method="post" action="index.php?pfad=register">
|
||||
|
||||
<p class="input-label">Email:</p>
|
||||
<input type="email" name="email" class="login-input" placeholder="mustermann@web.de" required>
|
||||
<input type="email"
|
||||
name="email"
|
||||
class="login-input"
|
||||
placeholder="mustermann@web.de"
|
||||
value="<?php echo htmlspecialchars($_POST["email"] ?? ""); ?>"
|
||||
required>
|
||||
|
||||
<p class="input-label">Vorname:</p>
|
||||
<input type="text" name="vorname" class="login-input" placeholder="Max" required>
|
||||
<input type="text"
|
||||
name="vorname"
|
||||
class="login-input"
|
||||
placeholder="Max"
|
||||
value="<?php echo htmlspecialchars($_POST["vorname"] ?? ""); ?>"
|
||||
required>
|
||||
|
||||
<p class="input-label">Nachname:</p>
|
||||
<input type="text" name="nachname" class="login-input" placeholder="Mustermann" required>
|
||||
<input type="text"
|
||||
name="nachname"
|
||||
class="login-input"
|
||||
placeholder="Mustermann"
|
||||
value="<?php echo htmlspecialchars($_POST["nachname"] ?? ""); ?>"
|
||||
required>
|
||||
|
||||
<p class="input-label">Passwort:</p>
|
||||
<input type="password" name="password" class="login-input" placeholder="Passwort" required>
|
||||
<input type="password"
|
||||
name="password"
|
||||
class="login-input"
|
||||
placeholder="Passwort"
|
||||
required>
|
||||
|
||||
<div class="checkbox-wrapper">
|
||||
<label>
|
||||
<input type="checkbox" value="remember-me"> angemeldet bleiben
|
||||
</label>
|
||||
</div>
|
||||
<button type="submit"
|
||||
value="register"
|
||||
name="registerSubmit"
|
||||
class="button">
|
||||
kostenlos registrieren
|
||||
</button>
|
||||
|
||||
<button type="submit" value="anmelden" name="loginSubmit" class="login-button">kostenlos registrieren</button>
|
||||
</form>
|
||||
|
||||
</div>
|
||||
</main>
|
||||
@@ -1,4 +1,9 @@
|
||||
<?php
|
||||
$user = $user ?? null;
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
exit();
|
||||
}
|
||||
include_once 'php/controller/showArticle-controller.php';
|
||||
?>
|
||||
<!--
|
||||
@@ -48,6 +53,11 @@ include_once 'php/controller/showArticle-controller.php';
|
||||
Bei der Validierung deiner Daten ist ein Fehler aufgetreten. Bitte versuche es erneut.
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
<?php if (isset($_SESSION["message"]) && $_SESSION["message"] == "unauthorized_access"): ?>
|
||||
<p class="alert-message is-error">
|
||||
Sie sind nicht berechtigt, diesen Beitrag zu bearbeiten.
|
||||
</p>
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
unset($_SESSION["message"]);
|
||||
?>
|
||||
@@ -76,7 +86,7 @@ include_once 'php/controller/showArticle-controller.php';
|
||||
<aside class="editor-sidebar">
|
||||
|
||||
<div class="sidebar-block">
|
||||
<button type="submit" class="btn-publish">Änderungen speichern</button>
|
||||
<button type="submit" class="button">Änderungen speichern</button>
|
||||
</div>
|
||||
|
||||
<div class="sidebar-block">
|
||||
|
||||
+2
-14
@@ -86,20 +86,8 @@
|
||||
}
|
||||
|
||||
/* Button-Zeugs */
|
||||
.article-editor-scope .btn-publish {
|
||||
background-color: #007cba;
|
||||
color: white;
|
||||
border: none;
|
||||
padding: 12px;
|
||||
border-radius: 4px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
font-size: 1rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.article-editor-scope .btn-publish:hover {
|
||||
background-color: #006ba1;
|
||||
.button#editor-button {
|
||||
padding: 18px 12px;
|
||||
}
|
||||
|
||||
/* Responsive Anpassungen unter 760px (für z.B. Smartphones) */
|
||||
|
||||
+2
-2
@@ -155,7 +155,7 @@ a, button, input, select, textarea, label, main{
|
||||
color: #1f2937;
|
||||
}
|
||||
|
||||
.login-button {
|
||||
.button {
|
||||
width: 100%;
|
||||
padding: 12px;
|
||||
background-color: #2563eb;
|
||||
@@ -168,7 +168,7 @@ a, button, input, select, textarea, label, main{
|
||||
transition: background-color 0.2s, transform 0.2s, box-shadow 0.2s;
|
||||
}
|
||||
|
||||
.login-button:hover {
|
||||
.button:hover {
|
||||
background-color: #1d4ed8;
|
||||
transform: translateY(-2px);
|
||||
box-shadow: 0 4px 10px rgba(0,0,0,0.15);
|
||||
|
||||
+1
-1
@@ -152,7 +152,7 @@ CSS für die navbar
|
||||
}
|
||||
|
||||
/* Responsive Anpassungen unter 760px (für z.B. Smartphones) */
|
||||
@media (max-width: 760px) {
|
||||
@media (max-width: 800px) {
|
||||
.nav {
|
||||
flex-direction: row;
|
||||
flex-wrap: wrap;
|
||||
|
||||
@@ -0,0 +1 @@
|
||||
[]
|
||||
@@ -1,6 +1,7 @@
|
||||
<!--
|
||||
Artikel: Datenschutz vs Datensicherheit
|
||||
Funktion: Inhalt zum Fach Informatik
|
||||
TODO: entfernen, wenn die Kategorie-Anzeige implementiert ist.
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
||||
+60
-17
@@ -1,27 +1,41 @@
|
||||
<?php
|
||||
session_start();
|
||||
?>
|
||||
|
||||
<!--
|
||||
Globales Menü, wird via PHP später in alle Seiten eingebunden
|
||||
-->
|
||||
<nav class="nav">
|
||||
<div class="nav__left">
|
||||
<a href="index.php" class="nav__logo">
|
||||
<img src="images/logos/logo_full.png" alt="Logo">
|
||||
</a>
|
||||
<img src="images/logos/logo_full.png" alt="Logo">
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- Mobile navbar mit Burger-Symbol -->
|
||||
<input type="checkbox" id="nav-toggle" class="nav__checkbox">
|
||||
<label for="nav-toggle" id="mobile-nav">
|
||||
<span>☰</span> <!-- Burger Icon Symbol -->
|
||||
<span>☰</span>
|
||||
</label>
|
||||
|
||||
<ul id="mobile-nav" class="nav__mobile-menu">
|
||||
<li>
|
||||
<label for="nav-toggle" class="nav__close-btn">×</label>
|
||||
</li>
|
||||
<li><a href="index.php?pfad=profile">Profil</a></li>
|
||||
<li><a href="index.php?pfad=login">Anmelden</a></li>
|
||||
<li><a href="index.php?pfad=register">Registrieren</a></li>
|
||||
<li><a href="index.php?pfad=createArticle">Beitrag erstellen</a></li>
|
||||
|
||||
<?php if (isset($_SESSION['user'])): ?>
|
||||
|
||||
<li><a href="index.php?pfad=profile">Profil</a></li>
|
||||
<li><a href="index.php?pfad=logout">Abmelden</a></li>
|
||||
<li><a href="index.php?pfad=createArticle">Beitrag erstellen</a></li>
|
||||
|
||||
<?php else: ?>
|
||||
|
||||
<li><a href="index.php?pfad=login">Anmelden</a></li>
|
||||
<li><a href="index.php?pfad=register">Registrieren</a></li>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
<li>
|
||||
<label class="nav__mobile-label">Sprachen</label>
|
||||
<ul class="nav__mobile-submenu">
|
||||
@@ -39,7 +53,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
|
||||
<li><a href="index.php?pfad=mathe">Mathematik</a></li>
|
||||
<li><a href="index.php?pfad=biologie">Biologie</a></li>
|
||||
<li><a href="index.php?pfad=chemie">Chemie</a></li>
|
||||
<li><a href="index.php?pfad=englisch">Physik</a></li>
|
||||
<li><a href="index.php?pfad=physik">Physik</a></li>
|
||||
<li><a href="index.php?pfad=informatik">Informatik</a></li>
|
||||
<li><a href="index.php?pfad=astronomie">Astronomie</a></li>
|
||||
</ul>
|
||||
@@ -85,6 +99,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
|
||||
<a href="index.php?pfad=literatur">Literatur</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="nav__item nav__dropdown">
|
||||
<button class="nav__dropdown-toggle">MINT</button>
|
||||
<div class="nav__dropdown-menu">
|
||||
@@ -96,6 +111,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
|
||||
<a href="index.php?pfad=astronomie">Astronomie</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="nav__item nav__dropdown">
|
||||
<button class="nav__dropdown-toggle">Gesellschaft & Werte</button>
|
||||
<div class="nav__dropdown-menu">
|
||||
@@ -112,6 +128,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
|
||||
<a href="index.php?pfad=theater">Theater</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="nav__item nav__dropdown">
|
||||
<button class="nav__dropdown-toggle">Technik & Praxis</button>
|
||||
<div class="nav__dropdown-menu">
|
||||
@@ -124,14 +141,40 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
|
||||
</div>
|
||||
|
||||
<div class="nav__right">
|
||||
<a href="index.php?pfad=profile" class="nav_item nav__link">Profil</a>
|
||||
<div class="nav__search">
|
||||
<?php
|
||||
include_once 'search.php';
|
||||
?>
|
||||
</div>
|
||||
<a href="index.php?pfad=login" class="nav__item nav__button">Anmelden</a>
|
||||
<a href="index.php?pfad=register" class="nav__item nav__button">Registrieren</a>
|
||||
<a href="index.php?pfad=createArticle" class="nav__item nav__button">Beitrag erstellen</a>
|
||||
|
||||
<?php if (isset($_SESSION['user'])): ?>
|
||||
|
||||
<a href="index.php?pfad=profile" class="nav__item nav__link">
|
||||
Profil
|
||||
</a>
|
||||
|
||||
<div class="nav__search">
|
||||
<?php include_once 'search.php'; ?>
|
||||
</div>
|
||||
|
||||
<a href="index.php?pfad=createArticle" class="nav__item nav__button">
|
||||
Beitrag erstellen
|
||||
</a>
|
||||
|
||||
<a href="index.php?pfad=logout" class="nav__item nav__button">
|
||||
Abmelden
|
||||
</a>
|
||||
|
||||
<?php else: ?>
|
||||
|
||||
<div class="nav__search">
|
||||
<?php include_once 'search.php'; ?>
|
||||
</div>
|
||||
|
||||
<a href="index.php?pfad=login" class="nav__item nav__button">
|
||||
Anmelden
|
||||
</a>
|
||||
|
||||
<a href="index.php?pfad=register" class="nav__item nav__button">
|
||||
Registrieren
|
||||
</a>
|
||||
|
||||
<?php endif; ?>
|
||||
|
||||
</div>
|
||||
</nav>
|
||||
@@ -1,52 +1,77 @@
|
||||
|
||||
<?php
|
||||
session_start();
|
||||
if (!isset($abs_path)) {
|
||||
require_once "path.php";
|
||||
ob_start();
|
||||
|
||||
$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 === "logout") {
|
||||
include_once "content/logout.php";
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($pfad === "deleteAccount") {
|
||||
include_once "content/deleteAccount.php";
|
||||
exit();
|
||||
}
|
||||
require_once $abs_path . "/php/controller/index-controller.php";
|
||||
?>
|
||||
|
||||
<!--
|
||||
Seite: Index der Lernplattform
|
||||
Funktion: Webseitengerüst, Anzeigen von Content
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
<!--
|
||||
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">
|
||||
<meta name="author" content="Niklas Ortmann">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="icon" type="image/x-icon" href="images/logos/logo_icon.ico">
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
<link rel="stylesheet" href="css/navbar.css">
|
||||
<link rel="stylesheet" href="css/footer.css">
|
||||
<link rel="stylesheet" href="css/search-results.css">
|
||||
<link rel="stylesheet" href="css/createArticle.css">
|
||||
<link rel="stylesheet" href="css/profile.css">
|
||||
<link rel="stylesheet" href="css/showArticle.css">
|
||||
<link rel="stylesheet" href="css/message.css">
|
||||
<title>EduForge</title>
|
||||
</head>
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="description" content="EduForge">
|
||||
<meta name="author" content="Niklas Ortmann">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<link rel="icon" type="image/x-icon" href="images/logos/logo_icon.ico">
|
||||
<link rel="stylesheet" href="css/main.css">
|
||||
<link rel="stylesheet" href="css/navbar.css">
|
||||
<link rel="stylesheet" href="css/footer.css">
|
||||
<link rel="stylesheet" href="css/search-results.css">
|
||||
<link rel="stylesheet" href="css/createArticle.css">
|
||||
<link rel="stylesheet" href="css/profile.css">
|
||||
<link rel="stylesheet" href="css/showArticle.css">
|
||||
<link rel="stylesheet" href="css/message.css">
|
||||
<title>EduForge</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<body>
|
||||
<?php
|
||||
include_once 'includes/navbar.php';
|
||||
//Dynamischer Inhalt:
|
||||
if (isset($_GET["pfad"])) {
|
||||
if (file_exists($abs_path . '/content/' . $_GET["pfad"] . '.php')) {
|
||||
include_once $abs_path . '/content/' . $_GET["pfad"] . '.php';
|
||||
} else {
|
||||
include_once $abs_path . '/content/404.php';
|
||||
}
|
||||
} else {
|
||||
include_once $abs_path . '/content/home.php';
|
||||
}
|
||||
include_once $abs_path . '/includes/footer.php';
|
||||
?>
|
||||
</body>
|
||||
|
||||
</html>
|
||||
/*
|
||||
Dynamischer Inhalt:
|
||||
Je nach pfad-Parameter wird die passende Datei aus content geladen.
|
||||
*/
|
||||
if (file_exists('content/' . $pfad . '.php')) {
|
||||
include_once 'content/' . $pfad . '.php';
|
||||
} else {
|
||||
include_once 'content/404.php';
|
||||
}
|
||||
|
||||
include_once 'includes/footer.php';
|
||||
?>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
|
||||
<?php
|
||||
ob_end_flush();
|
||||
?>
|
||||
@@ -1,4 +0,0 @@
|
||||
<?php
|
||||
// mit $_SERVER['DOCUMENT_ROOT'] später umbauen?
|
||||
$abs_path = __DIR__;
|
||||
?>
|
||||
@@ -1,86 +1,89 @@
|
||||
<?php
|
||||
session_start();
|
||||
SESSION_START();
|
||||
require_once '../model/LocalArticleManager.php';
|
||||
require_once '../model/ArticleManager.php';
|
||||
require_once '../validator/article-validator.php';
|
||||
require_once "../model/LocalUserDAO.php";
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
$_SESSION["old_title"] = $_POST["title"] ?? '';
|
||||
$_SESSION["old_content"] = $_POST["content"] ?? '';
|
||||
$_SESSION["old_category"] = $_POST["category"] ?? '';
|
||||
$_SESSION["old_tags"] = $_POST["tags"] ?? '';
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
$_SESSION["old_title"] = $_POST["title"] ?? '';
|
||||
$_SESSION["old_content"] = $_POST["content"] ?? '';
|
||||
$_SESSION["old_category"] = $_POST["category"] ?? '';
|
||||
$_SESSION["old_tags"] = $_POST["tags"] ?? '';
|
||||
|
||||
if(!isset($_POST["title"]) ||!isset($_POST["content"]) || !isset($_POST["category"])){
|
||||
$_SESSION["message"] = "missing_parameters";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
} else {
|
||||
$title = $_POST["title"];
|
||||
$content = $_POST["content"];
|
||||
$author = "max.mustermann"; // TODO: später aus Session den angemeldeten Nutzer beziehen.
|
||||
$category = $_POST["category"];
|
||||
$tags = $_POST['tags'] ?? '';
|
||||
|
||||
// -------------------------------- Validierung der Daten: -------------------------
|
||||
if (!articleAuthorValidator($author)) {
|
||||
$_SESSION["message"] = "author_not_valid";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!articleTitleValidator($title)) {
|
||||
$_SESSION["message"] = "invalid_title";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!articleContentValidator($content)) {
|
||||
$_SESSION["message"] = "invalid_content";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!articleCategoryValidator($category)) {
|
||||
$_SESSION["message"] = "invalid_category";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!articleTagValidator($tags)) {
|
||||
$_SESSION["message"] = "invalid_tags";
|
||||
if(!isset($_POST["title"]) ||!isset($_POST["content"]) || !isset($_POST["category"])){
|
||||
$_SESSION["message"] = "missing_parameters";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
} else {
|
||||
$cleanedTags = [];
|
||||
$rawTags = explode(',', $tags);
|
||||
foreach ($rawTags as $rawTag) {
|
||||
// Leerzeichen am Anfang/Ende des einzelnen Tags entfernen:
|
||||
$tag = trim($rawTag);
|
||||
$cleanedTags[] = $tag;
|
||||
$title = $_POST["title"];
|
||||
$content = $_POST["content"];
|
||||
$author = $_SESSION["user_email"];
|
||||
$category = $_POST["category"];
|
||||
$tags = $_POST['tags'] ?? '';
|
||||
|
||||
// -------------------------------- Validierung der Daten: -------------------------
|
||||
if (!articleAuthorValidator($author)) {
|
||||
$_SESSION["message"] = "author_not_valid";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
// Duplikate entfernen:
|
||||
$cleanedTags = array_unique($cleanedTags);
|
||||
$cleanedTags = implode(',', $cleanedTags);
|
||||
}
|
||||
// ----------------- Übertragung der validierten Daten in ArticleManager: ---------------------------
|
||||
try {
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$articleManager->addArticle($title, $content, $author, $category, $cleanedTags);
|
||||
|
||||
// Formulardaten nach erfolgreichem Erstellen aus der Session löschen
|
||||
unset($_SESSION["old_title"], $_SESSION["old_content"], $_SESSION["old_category"], $_SESSION["old_tags"]);
|
||||
if (!articleTitleValidator($title)) {
|
||||
$_SESSION["message"] = "invalid_title";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
} catch (Exception $e){
|
||||
$_SESSION["message"] = "internal_error";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
if (!articleContentValidator($content)) {
|
||||
$_SESSION["message"] = "invalid_content";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!articleCategoryValidator($category)) {
|
||||
$_SESSION["message"] = "invalid_category";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
if (!articleTagValidator($tags)) {
|
||||
$_SESSION["message"] = "invalid_tags";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
} else {
|
||||
$cleanedTags = [];
|
||||
$rawTags = explode(',', $tags);
|
||||
foreach ($rawTags as $rawTag) {
|
||||
// Leerzeichen am Anfang/Ende des einzelnen Tags entfernen:
|
||||
$tag = trim($rawTag);
|
||||
$cleanedTags[] = $tag;
|
||||
}
|
||||
// Duplikate entfernen:
|
||||
$cleanedTags = array_unique($cleanedTags);
|
||||
$cleanedTags = implode(',', $cleanedTags);
|
||||
}
|
||||
// ----------------- Übertragung der validierten Daten in ArticleManager: ---------------------------
|
||||
try {
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$articleManager->addArticle($title, $content, $author, $category, $cleanedTags);
|
||||
|
||||
// Formulardaten nach erfolgreichem Erstellen aus der Session löschen
|
||||
unset($_SESSION["old_title"], $_SESSION["old_content"], $_SESSION["old_category"], $_SESSION["old_tags"]);
|
||||
|
||||
} catch (Exception $e){
|
||||
$_SESSION["message"] = "internal_error";
|
||||
header("location: ../../index.php?pfad=createArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
$_SESSION["message"] = "new_article";
|
||||
// Weiterleitung zur Homepage
|
||||
header("location: ../../index.php");
|
||||
exit();
|
||||
}
|
||||
|
||||
$_SESSION["message"] = "new_article";
|
||||
// Weiterleitung zur Homepage
|
||||
header("location: ../../index.php");
|
||||
exit();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
?>
|
||||
@@ -0,0 +1,35 @@
|
||||
<?php
|
||||
|
||||
require_once "php/model/LocalUserDAO.php";
|
||||
|
||||
$dao = new LocalUserDAO();
|
||||
$error = null;
|
||||
|
||||
/*
|
||||
Verarbeitung des Login-Formulars
|
||||
Funktion: Prüft Benutzerdaten und erstellt Session für eingeloggten Nutzer
|
||||
*/
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
|
||||
$email = $_POST["email"] ?? "";
|
||||
$password = $_POST["password"] ?? "";
|
||||
|
||||
$user = $dao->findUser($email);
|
||||
|
||||
if ($user && password_verify($password, $user["password"])) {
|
||||
|
||||
if (isset($user["vorname"]) && isset($user["nachname"])) {
|
||||
$_SESSION["user"] = $user["vorname"] . " " . $user["nachname"];
|
||||
} else {
|
||||
$_SESSION["user"] = $user["username"] ?? "";
|
||||
}
|
||||
|
||||
$_SESSION["user_email"] = $user["email"];
|
||||
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
|
||||
} else {
|
||||
$error = "Login fehlgeschlagen. Bitte überprüfe deine Eingaben.";
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,91 @@
|
||||
<?php
|
||||
|
||||
require_once "php/model/LocalUserDAO.php";
|
||||
require_once "php/model/Article.php";
|
||||
require_once "php/model/ArticleManager.php";
|
||||
require_once "php/validator/user-validator.php";
|
||||
|
||||
$error = null;
|
||||
|
||||
if (!isset($_SESSION["user"])) {
|
||||
header("Location: index.php?pfad=login");
|
||||
exit();
|
||||
}
|
||||
|
||||
try {
|
||||
$dao = new LocalUserDAO();
|
||||
|
||||
$user = $dao->findUser($_SESSION["user_email"] ?? "");
|
||||
|
||||
if (!$user) {
|
||||
$_SESSION = [];
|
||||
session_destroy();
|
||||
|
||||
header("Location: index.php?pfad=login");
|
||||
exit();
|
||||
}
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST" && isset($_POST["saveProfile"])) {
|
||||
$oldEmail = $_SESSION["user_email"];
|
||||
|
||||
$newEmail = trim($_POST["email"] ?? "");
|
||||
$vorname = trim($_POST["vorname"] ?? "");
|
||||
$nachname = trim($_POST["nachname"] ?? "");
|
||||
$password = $_POST["password"] ?? "";
|
||||
|
||||
if (!userEmailValidator($newEmail)) {
|
||||
$error = "Bitte gib eine gültige E-Mail-Adresse ein.";
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
} elseif (!userNameValidator($vorname)) {
|
||||
$error = "Der Vorname muss 2 bis 50 Zeichen lang sein und darf nur Buchstaben, Leerzeichen und Bindestriche enthalten.";
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
} elseif (!userNameValidator($nachname)) {
|
||||
$error = "Der Nachname muss 2 bis 50 Zeichen lang sein und darf nur Buchstaben, Leerzeichen und Bindestriche enthalten.";
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
} elseif (!userOptionalPasswordValidator($password)) {
|
||||
$error = "Das Passwort muss 8 bis 72 Zeichen lang sein.";
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
} else {
|
||||
$updated = $dao->updateUser(
|
||||
$oldEmail,
|
||||
$newEmail,
|
||||
$vorname,
|
||||
$nachname,
|
||||
$password
|
||||
);
|
||||
|
||||
if ($updated) {
|
||||
$_SESSION["user"] = $vorname . " " . $nachname;
|
||||
$_SESSION["user_email"] = $newEmail;
|
||||
|
||||
header("Location: index.php?pfad=profile");
|
||||
exit();
|
||||
} else {
|
||||
$error = "Die Daten konnten nicht gespeichert werden.";
|
||||
$_GET["edit"] = "1";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$user = $dao->findUser($_SESSION["user_email"] ?? "");
|
||||
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$userArticles = $articleManager->getArticlesByAuthor($_SESSION["user_email"]);
|
||||
|
||||
if (!isset($userArticles)) {
|
||||
$_SESSION["message"] = "user_has_no_articles";
|
||||
}
|
||||
|
||||
} catch (InvalidArgumentException $e) {
|
||||
$error = $e->getMessage();
|
||||
$_GET["edit"] = "1";
|
||||
|
||||
} catch (Exception $e) {
|
||||
$error = "Es ist ein interner Fehler aufgetreten. Bitte versuche es erneut.";
|
||||
$_SESSION["message"] = "internal_error";
|
||||
$_GET["edit"] = "1";
|
||||
}
|
||||
@@ -3,12 +3,15 @@
|
||||
* Controller für die Liste der eigenen Beiträge eines Nutzers auf der eigenen Profilseite
|
||||
*/
|
||||
|
||||
session_start();
|
||||
require_once 'php/model/Article.php';
|
||||
require_once 'php/model/ArticleManager.php';
|
||||
require_once "../model/LocalUserDAO.php";
|
||||
|
||||
try {
|
||||
$author = "max.mustermann"; // TODO: später Nutzer aus der Session beziehen.
|
||||
$dao = new LocalUserDAO();
|
||||
$user = $dao->findUser($_SESSION["user_email"] ?? "");
|
||||
|
||||
$author = $user["email"];
|
||||
$articleManager = ArticleManager::getInstance();
|
||||
$userArticles = $articleManager->getArticlesByAuthor($author);
|
||||
if(!isset($userArticles)) {
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
<?php
|
||||
|
||||
require_once "php/model/LocalUserDAO.php";
|
||||
require_once "php/validator/user-validator.php";
|
||||
|
||||
$error = null;
|
||||
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
|
||||
$email = trim($_POST["email"] ?? "");
|
||||
$vorname = trim($_POST["vorname"] ?? "");
|
||||
$nachname = trim($_POST["nachname"] ?? "");
|
||||
$plainPassword = $_POST["password"] ?? "";
|
||||
|
||||
if (!userEmailValidator($email)) {
|
||||
$error = "Bitte gib eine gültige E-Mail-Adresse ein.";
|
||||
} elseif (!userNameValidator($vorname)) {
|
||||
$error = "Der Vorname muss 2 bis 50 Zeichen lang sein und darf nur Buchstaben, Umlaute, Leerzeichen und Bindestriche enthalten.";
|
||||
} elseif (!userNameValidator($nachname)) {
|
||||
$error = "Der Nachname muss 2 bis 50 Zeichen lang sein und darf nur Buchstaben, Umlaute, Leerzeichen und Bindestriche enthalten.";
|
||||
} elseif (!userPasswordValidator($plainPassword)) {
|
||||
$error = "Das Passwort muss 8 bis 72 Zeichen lang sein.";
|
||||
} else {
|
||||
try {
|
||||
$dao = new LocalUserDAO();
|
||||
|
||||
$password = password_hash($plainPassword, PASSWORD_DEFAULT);
|
||||
|
||||
$dao->addUser($email, $vorname, $nachname, $password);
|
||||
|
||||
$_SESSION["user"] = $vorname . " " . $nachname;
|
||||
$_SESSION["user_email"] = $email;
|
||||
|
||||
header("Location: index.php");
|
||||
exit();
|
||||
|
||||
} catch (InvalidArgumentException $e) {
|
||||
$error = $e->getMessage();
|
||||
} catch (Exception $e) {
|
||||
$error = "Die Registrierung konnte nicht gespeichert werden.";
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,5 +1,5 @@
|
||||
<?php
|
||||
session_start();
|
||||
SESSION_START();
|
||||
require_once '../model/LocalArticleManager.php';
|
||||
require_once '../model/ArticleManager.php';
|
||||
require_once '../model/Article.php';
|
||||
@@ -8,7 +8,7 @@ require_once '../validator/article-validator.php';
|
||||
if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
$_SESSION["old_title"] = $_POST["title"] ?? '';
|
||||
$_SESSION["old_content"] = $_POST["content"] ?? '';
|
||||
$_SESSION["old_category"] = $_POST["category"] ?? '';
|
||||
$_SESSION["old_category"] = $_POST["category"] ?? ''; // TODO: die Kategorie im Dropdown setzen, wenn der Editor erneut geöffnet wird.
|
||||
$_SESSION["old_tags"] = $_POST["tags"] ?? '';
|
||||
|
||||
if (isset($_GET["id"]) && !empty($_GET["id"])) {
|
||||
@@ -26,7 +26,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
}else{
|
||||
$title = $_POST["title"];
|
||||
$content = $_POST["content"];
|
||||
$author = "max.mustermann"; // TODO: später aus Session den angemeldeten Nutzer beziehen.
|
||||
$author = $_SESSION["user_email"];
|
||||
$category = $_POST["category"];
|
||||
$tags = $_POST['tags'] ?? '';
|
||||
|
||||
@@ -82,7 +82,7 @@ if ($_SERVER["REQUEST_METHOD"] === "POST") {
|
||||
$article->setTags($cleanedTags);
|
||||
$articleManager->updateArticle($id ,$article, $author);
|
||||
} catch (Exception $e){
|
||||
$_SESSION["message"] = "internal_error";
|
||||
$_SESSION["message"] = $e->getMessage();
|
||||
header("location: ../../index.php?pfad=updateArticle");
|
||||
exit();
|
||||
}
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
<?php
|
||||
require_once "Article.php";
|
||||
|
||||
class NotFoundException extends Exception {}
|
||||
class UnauthorizedAccessException extends Exception {}
|
||||
class InternalServerErrorException extends Exception {}
|
||||
|
||||
/**
|
||||
* Die Klasse beinhaltet alle Methoden für die Operation mit den Artikel-Daten.
|
||||
*
|
||||
@@ -16,7 +21,7 @@ interface ArticleManagerDAO
|
||||
* @param $tags string optionale Schlagworte für eine bessere Suche
|
||||
*
|
||||
* Mögliche Exceptions:
|
||||
* TODO Fehlerbeschreibung hinzufügen & tags hinzufügen
|
||||
* TODO: Exceptions implementieren.
|
||||
*/
|
||||
public function addArticle($title, $content, $author, $category, $tags);
|
||||
|
||||
@@ -29,7 +34,10 @@ interface ArticleManagerDAO
|
||||
* @param $author
|
||||
* @return void
|
||||
*
|
||||
* TODO: Fehlerbeschreibung hinzufügen
|
||||
* @throws InternalServerErrorException
|
||||
* @throws NotFoundException
|
||||
* @throws UnauthorizedAccessException
|
||||
* /
|
||||
*/
|
||||
public function updateArticle($id, $article, $author);
|
||||
|
||||
@@ -38,7 +46,7 @@ interface ArticleManagerDAO
|
||||
* @param $id
|
||||
* @return void
|
||||
*
|
||||
* TODO: Fehlerbeschreibung hinzufügen
|
||||
* TODO: Exceptions implementieren.
|
||||
*/
|
||||
public function deleteArticle($id);
|
||||
|
||||
@@ -48,7 +56,7 @@ interface ArticleManagerDAO
|
||||
*
|
||||
* @return Article
|
||||
* Mögliche Exceptions:
|
||||
* TODO Fehlerbeschreibung hinzufügen
|
||||
* TODO: Exceptions implementieren.
|
||||
*/
|
||||
public function getArticle($id);
|
||||
|
||||
@@ -56,7 +64,7 @@ interface ArticleManagerDAO
|
||||
* Alle Beiträge aufrufen.
|
||||
*
|
||||
* Mögliche Exceptions:
|
||||
* TODO Fehlerbeschreibung hinzufügen
|
||||
* TODO: Exceptions implementieren.
|
||||
*/
|
||||
public function getAllArticles();
|
||||
|
||||
@@ -64,6 +72,7 @@ interface ArticleManagerDAO
|
||||
* Gibt alle Beiträge eines Nutzer mit einer gegebenen ID aus.
|
||||
* @param $author
|
||||
* @return Article[]
|
||||
* TODO: Exceptions implementieren.
|
||||
*/
|
||||
public function getArticlesByAuthor($author);
|
||||
|
||||
|
||||
@@ -36,6 +36,7 @@ class LocalArticleManager implements ArticleManagerDAO {
|
||||
* Speichert alle Artikel/Beiträge in der Datei.
|
||||
* @param $articles
|
||||
* @return void
|
||||
* TODO: Exceptions implementieren.
|
||||
*/
|
||||
public function saveArticle($articles)
|
||||
{
|
||||
@@ -65,14 +66,12 @@ class LocalArticleManager implements ArticleManagerDAO {
|
||||
public function updateArticle($id, $article, $author)
|
||||
{
|
||||
if (empty($article)) {
|
||||
// TODO: Implement Exception.
|
||||
return;
|
||||
throw new InternalServerErrorException("internal_error");
|
||||
}
|
||||
|
||||
// Berechtigungsprüfung:
|
||||
if ($article->getAuthor() !== $author) {
|
||||
// TODO: Implement Exception.
|
||||
return;
|
||||
throw new UnauthorizedAccessException("unauthorized_access");
|
||||
}
|
||||
|
||||
// Beitrag aktualisieren:
|
||||
@@ -92,15 +91,14 @@ class LocalArticleManager implements ArticleManagerDAO {
|
||||
];
|
||||
$updated = true;
|
||||
break;
|
||||
}else{
|
||||
// TODO: Implement Exception.
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// Nur speichern, wenn Beitrag geändert wurde:
|
||||
if ($updated) {
|
||||
$this->saveArticle($articles);
|
||||
} else {
|
||||
throw new NotFoundException("missing_id");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,179 @@
|
||||
<?php
|
||||
|
||||
require_once "UserDAOInterface.php";
|
||||
|
||||
class LocalUserDAO implements UserDAOInterface {
|
||||
|
||||
private string $file = "data/users.json";
|
||||
|
||||
/**
|
||||
* Lädt alle Benutzer aus der JSON-Datei.
|
||||
*
|
||||
* @return array Liste aller Benutzer
|
||||
* @throws RuntimeException wenn die Datei nicht gelesen werden kann
|
||||
* oder fehlerhafte JSON-Daten enthält
|
||||
*/
|
||||
private function loadUsers() {
|
||||
if (!file_exists($this->file)) {
|
||||
return [];
|
||||
}
|
||||
|
||||
$json = file_get_contents($this->file);
|
||||
|
||||
if ($json === false) {
|
||||
throw new RuntimeException("Benutzerdaten konnten nicht gelesen werden.");
|
||||
}
|
||||
|
||||
$users = json_decode($json, true);
|
||||
|
||||
if ($users === null && json_last_error() !== JSON_ERROR_NONE) {
|
||||
throw new RuntimeException("Benutzerdaten sind fehlerhaft.");
|
||||
}
|
||||
|
||||
return is_array($users) ? $users : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* Speichert alle Benutzer in die JSON-Datei.
|
||||
*
|
||||
* @param array $users Liste aller Benutzer
|
||||
* @return void
|
||||
* @throws RuntimeException wenn die Daten nicht gespeichert werden können
|
||||
*/
|
||||
private function saveUsers($users) {
|
||||
$json = json_encode($users, JSON_PRETTY_PRINT);
|
||||
|
||||
if ($json === false) {
|
||||
throw new RuntimeException("Benutzerdaten konnten nicht umgewandelt werden.");
|
||||
}
|
||||
|
||||
$result = file_put_contents($this->file, $json);
|
||||
|
||||
if ($result === false) {
|
||||
throw new RuntimeException("Benutzerdaten konnten nicht gespeichert werden.");
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sucht einen Benutzer anhand seiner E-Mail-Adresse.
|
||||
*
|
||||
* @param string $email E-Mail-Adresse des gesuchten Benutzers
|
||||
* @return array|null Benutzerdaten oder null, wenn kein Benutzer gefunden wurde
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen werden können
|
||||
*/
|
||||
public function findUser($email) {
|
||||
$users = $this->loadUsers();
|
||||
|
||||
foreach ($users as $user) {
|
||||
if (isset($user["email"]) && $user["email"] === $email) {
|
||||
|
||||
if (!isset($user["vorname"]) && isset($user["username"])) {
|
||||
$nameParts = explode(" ", $user["username"], 2);
|
||||
$user["vorname"] = $nameParts[0] ?? "";
|
||||
$user["nachname"] = $nameParts[1] ?? "";
|
||||
}
|
||||
|
||||
return $user;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fügt einen neuen Benutzer hinzu.
|
||||
*
|
||||
* @param string $email E-Mail-Adresse
|
||||
* @param string $vorname Vorname
|
||||
* @param string $nachname Nachname
|
||||
* @param string $password Passwort-Hash
|
||||
* @return void
|
||||
* @throws InvalidArgumentException wenn die E-Mail-Adresse bereits verwendet wird
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen oder gespeichert werden können
|
||||
*/
|
||||
public function addUser($email, $vorname, $nachname, $password) {
|
||||
$users = $this->loadUsers();
|
||||
|
||||
foreach ($users as $user) {
|
||||
if (isset($user["email"]) && $user["email"] === $email) {
|
||||
throw new InvalidArgumentException("Diese E-Mail-Adresse wird bereits verwendet.");
|
||||
}
|
||||
}
|
||||
|
||||
$users[] = [
|
||||
"email" => $email,
|
||||
"vorname" => $vorname,
|
||||
"nachname" => $nachname,
|
||||
"password" => $password
|
||||
];
|
||||
|
||||
$this->saveUsers($users);
|
||||
}
|
||||
|
||||
/**
|
||||
* Aktualisiert einen bestehenden Benutzer.
|
||||
*
|
||||
* @param string $oldEmail Alte E-Mail-Adresse
|
||||
* @param string $newEmail Neue E-Mail-Adresse
|
||||
* @param string $vorname Neuer Vorname
|
||||
* @param string $nachname Neuer Nachname
|
||||
* @param string|null $password Neues Passwort oder null
|
||||
* @return bool true, wenn der Benutzer aktualisiert wurde, sonst false
|
||||
* @throws InvalidArgumentException wenn die neue E-Mail-Adresse bereits verwendet wird
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen oder gespeichert werden können
|
||||
*/
|
||||
public function updateUser($oldEmail, $newEmail, $vorname, $nachname, $password = null) {
|
||||
$users = $this->loadUsers();
|
||||
|
||||
foreach ($users as $user) {
|
||||
if (
|
||||
isset($user["email"])
|
||||
&& $user["email"] === $newEmail
|
||||
&& $newEmail !== $oldEmail
|
||||
) {
|
||||
throw new InvalidArgumentException("Diese E-Mail-Adresse wird bereits verwendet.");
|
||||
}
|
||||
}
|
||||
|
||||
foreach ($users as $i => $user) {
|
||||
if (isset($user["email"]) && $user["email"] === $oldEmail) {
|
||||
$users[$i]["email"] = $newEmail;
|
||||
$users[$i]["vorname"] = $vorname;
|
||||
$users[$i]["nachname"] = $nachname;
|
||||
|
||||
unset($users[$i]["username"]);
|
||||
|
||||
if (!empty($password)) {
|
||||
$users[$i]["password"] = password_hash($password, PASSWORD_DEFAULT);
|
||||
}
|
||||
|
||||
$this->saveUsers($users);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Löscht einen Benutzer anhand seiner E-Mail-Adresse.
|
||||
*
|
||||
* @param string $email E-Mail-Adresse des zu löschenden Benutzers
|
||||
* @return bool true, wenn der Benutzer gelöscht wurde, sonst false
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen oder gespeichert werden können
|
||||
*/
|
||||
public function deleteUser($email) {
|
||||
$users = $this->loadUsers();
|
||||
|
||||
foreach ($users as $i => $user) {
|
||||
if (isset($user["email"]) && $user["email"] === $email) {
|
||||
unset($users[$i]);
|
||||
$users = array_values($users);
|
||||
$this->saveUsers($users);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,89 @@
|
||||
<?php
|
||||
|
||||
/**
|
||||
* Interface für den Zugriff auf Benutzerdaten.
|
||||
*
|
||||
* Definiert die Methoden, die jede UserDAO-Implementierung
|
||||
* bereitstellen muss.
|
||||
*/
|
||||
interface UserDAOInterface {
|
||||
|
||||
/**
|
||||
* Sucht einen Benutzer anhand seiner E-Mail-Adresse.
|
||||
*
|
||||
* Funktion:
|
||||
* Liefert die gespeicherten Benutzerdaten zu einer E-Mail-Adresse.
|
||||
*
|
||||
* Eingabe:
|
||||
* @param string $email E-Mail-Adresse des gesuchten Benutzers
|
||||
*
|
||||
* Ausgabe:
|
||||
* @return array|null Benutzerdaten als Array oder null
|
||||
*
|
||||
* Mögliche Fehler:
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen werden können
|
||||
*/
|
||||
public function findUser($email);
|
||||
|
||||
/**
|
||||
* Fügt einen neuen Benutzer hinzu.
|
||||
*
|
||||
* Funktion:
|
||||
* Erstellt einen neuen Benutzereintrag und speichert ihn
|
||||
* in der jeweiligen Datenquelle.
|
||||
*
|
||||
* Eingabe:
|
||||
* @param string $email E-Mail-Adresse des Benutzers
|
||||
* @param string $vorname Vorname des Benutzers
|
||||
* @param string $nachname Nachname des Benutzers
|
||||
* @param string $password Passwort des Benutzers
|
||||
*
|
||||
* Ausgabe:
|
||||
* @return void
|
||||
*
|
||||
* Mögliche Fehler:
|
||||
* @throws InvalidArgumentException wenn die E-Mail-Adresse bereits verwendet wird
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen oder gespeichert werden können
|
||||
*/
|
||||
public function addUser($email, $vorname, $nachname, $password);
|
||||
|
||||
/**
|
||||
* Aktualisiert einen bestehenden Benutzer.
|
||||
*
|
||||
* Funktion:
|
||||
* Ändert die E-Mail-Adresse, den Vornamen, den Nachnamen
|
||||
* und optional das Passwort eines bestehenden Benutzers.
|
||||
*
|
||||
* Eingabe:
|
||||
* @param string $oldEmail Alte E-Mail-Adresse
|
||||
* @param string $newEmail Neue E-Mail-Adresse
|
||||
* @param string $vorname Neuer Vorname
|
||||
* @param string $nachname Neuer Nachname
|
||||
* @param string|null $password Neues Passwort oder null
|
||||
*
|
||||
* Ausgabe:
|
||||
* @return bool true, wenn der Benutzer aktualisiert wurde, sonst false
|
||||
*
|
||||
* Mögliche Fehler:
|
||||
* @throws InvalidArgumentException wenn die neue E-Mail-Adresse bereits verwendet wird
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen oder gespeichert werden können
|
||||
*/
|
||||
public function updateUser($oldEmail, $newEmail, $vorname, $nachname, $password = null);
|
||||
|
||||
/**
|
||||
* Löscht einen Benutzer anhand seiner E-Mail-Adresse.
|
||||
*
|
||||
* Funktion:
|
||||
* Entfernt einen vorhandenen Benutzer aus der Datenquelle.
|
||||
*
|
||||
* Eingabe:
|
||||
* @param string $email E-Mail-Adresse des zu löschenden Benutzers
|
||||
*
|
||||
* Ausgabe:
|
||||
* @return bool true, wenn der Benutzer gelöscht wurde, sonst false
|
||||
*
|
||||
* Mögliche Fehler:
|
||||
* @throws RuntimeException wenn die Benutzerdaten nicht gelesen oder gespeichert werden können
|
||||
*/
|
||||
public function deleteUser($email);
|
||||
}
|
||||
@@ -0,0 +1,33 @@
|
||||
<?php
|
||||
|
||||
function userNameValidator($name)
|
||||
{
|
||||
$name = trim($name);
|
||||
$namePattern = '/^[a-zA-ZäöüÄÖÜß\s-]{2,50}$/u';
|
||||
|
||||
return preg_match($namePattern, $name) === 1;
|
||||
}
|
||||
|
||||
function userEmailValidator($email)
|
||||
{
|
||||
$email = trim($email);
|
||||
|
||||
return filter_var($email, FILTER_VALIDATE_EMAIL) !== false
|
||||
&& mb_strlen($email) <= 100;
|
||||
}
|
||||
|
||||
function userPasswordValidator($password)
|
||||
{
|
||||
$zeichenAnzahl = mb_strlen($password);
|
||||
|
||||
return $zeichenAnzahl >= 8 && $zeichenAnzahl <= 72;
|
||||
}
|
||||
|
||||
function userOptionalPasswordValidator($password)
|
||||
{
|
||||
if (!isset($password) || $password === '') {
|
||||
return true;
|
||||
}
|
||||
|
||||
return userPasswordValidator($password);
|
||||
}
|
||||
@@ -1,6 +1,7 @@
|
||||
<!--
|
||||
Artikel: Satz des Pythagoras
|
||||
Funktion: Inhalt zum Fach Mathe
|
||||
TODO: entfernen, wenn die Kategorie-Anzeige implementiert ist.
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<!--
|
||||
Artikel: Tunneleffekt
|
||||
Funktion: Inhalt zum Fach Physik
|
||||
TODO: entfernen, wenn die Kategorie-Anzeige implementiert ist.
|
||||
-->
|
||||
<!DOCTYPE html>
|
||||
<html lang="de">
|
||||
|
||||
Reference in New Issue
Block a user