Compare commits

..

2 Commits

Author SHA1 Message Date
caroline.slt c22853d802 Merge remote-tracking branch 'origin/bugs' into bugs 2026-07-19 22:29:58 +02:00
niklas.ortmann 4abc5f4167 . 2026-07-19 22:29:52 +02:00
4 changed files with 5 additions and 11 deletions
-1
View File
@@ -1,5 +1,4 @@
<?php <?php
include_once 'php/controller/profile-controller.php';
$user = $user ?? null; $user = $user ?? null;
$isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error); $isEditMode = (isset($_GET["edit"]) && $_GET["edit"] === "1") || !empty($error);
+3 -3
View File
@@ -16,7 +16,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
<!-- Mobile navbar mit Burger-Symbol --> <!-- Mobile navbar mit Burger-Symbol -->
<input type="checkbox" id="nav-toggle" class="nav__checkbox"> <input type="checkbox" id="nav-toggle" class="nav__checkbox">
<label for="nav-toggle" class="nav__mobile-button"> <label for="nav-toggle" id="mobile-nav">
<span>☰</span> <span>☰</span>
</label> </label>
@@ -151,7 +151,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
</a> </a>
<div class="nav__search"> <div class="nav__search">
<?php include_once __DIR__ . '/search.php'; ?> <?php include_once 'search.php'; ?>
</div> </div>
<a href="index.php?pfad=createArticle" class="nav__item nav__button"> <a href="index.php?pfad=createArticle" class="nav__item nav__button">
@@ -165,7 +165,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
<?php else: ?> <?php else: ?>
<div class="nav__search"> <div class="nav__search">
<?php include_once __DIR__ . '/search.php'; ?> <?php include_once 'search.php'; ?>
</div> </div>
<a href="index.php?pfad=login" class="nav__item nav__button"> <a href="index.php?pfad=login" class="nav__item nav__button">
-7
View File
@@ -2,13 +2,6 @@
if (session_status() === PHP_SESSION_NONE) { if (session_status() === PHP_SESSION_NONE) {
session_start(); session_start();
} }
include_once "includes/csrf.php";
include_once "php/controller/index-controller.php";
?>
if (session_status() === PHP_SESSION_NONE) {
session_start();
}
include_once "includes/csrf.php"; include_once "includes/csrf.php";
include_once "php/controller/index-controller.php"; include_once "php/controller/index-controller.php";
?> ?>
+2
View File
@@ -20,6 +20,8 @@ if ($pfad === "login") {
include_once "php/controller/confirm-register-controller.php"; include_once "php/controller/confirm-register-controller.php";
} elseif ($pfad === "confirm-password") { } elseif ($pfad === "confirm-password") {
include_once "php/controller/confirm-password-controller.php"; include_once "php/controller/confirm-password-controller.php";
} elseif ($pfad === "profile") {
include_once "php/controller/profile-controller.php";
} elseif ($pfad === "updateComment") { } elseif ($pfad === "updateComment") {
include_once "php/controller/updateComment-controller.php"; include_once "php/controller/updateComment-controller.php";
} elseif($pfad === "deleteComment") { } elseif($pfad === "deleteComment") {