Merge branch 'visuelles-Feedback' into devNachCSRF
This commit is contained in:
+40
-2
@@ -5,6 +5,30 @@ $repliesByParent = [];
|
||||
$articleObj = null;
|
||||
|
||||
include_once 'php/controller/showArticle-controller.php';
|
||||
require_once 'php/model/UserManager.php';
|
||||
|
||||
$userManager = UserManager::getInstance();
|
||||
|
||||
/**
|
||||
* Liefert den vollständigen Namen zu einer gespeicherten E-Mail-Adresse.
|
||||
* Falls kein Benutzer gefunden wird, wird die E-Mail als Ersatz angezeigt.
|
||||
*/
|
||||
function getCommentAuthorName($email, $userManager)
|
||||
{
|
||||
$email = trim($email);
|
||||
$user = $userManager->findUser($email);
|
||||
|
||||
if ($user === null) {
|
||||
return $email;
|
||||
}
|
||||
|
||||
$vorname = trim($user["vorname"] ?? "");
|
||||
$nachname = trim($user["nachname"] ?? "");
|
||||
|
||||
$fullName = trim($vorname . " " . $nachname);
|
||||
|
||||
return $fullName !== "" ? $fullName : $email;
|
||||
}
|
||||
/*
|
||||
* Ermittelt, ob ohne JavaScript auf einen Kommentar
|
||||
* geantwortet werden soll.
|
||||
@@ -178,7 +202,14 @@ if ($replyAuthor === null) {
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php echo htmlspecialchars($comment->getAuthor()); ?>
|
||||
<?php
|
||||
echo htmlspecialchars(
|
||||
getCommentAuthorName(
|
||||
$comment->getAuthor(),
|
||||
$userManager
|
||||
)
|
||||
);
|
||||
?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
@@ -313,7 +344,14 @@ if ($replyAuthor === null) {
|
||||
|
||||
<p>
|
||||
<strong>
|
||||
<?php echo htmlspecialchars($reply->getAuthor()); ?>
|
||||
<?php
|
||||
echo htmlspecialchars(
|
||||
getCommentAuthorName(
|
||||
$reply->getAuthor(),
|
||||
$userManager
|
||||
)
|
||||
);
|
||||
?>
|
||||
</strong>
|
||||
|
||||
<span>
|
||||
|
||||
Reference in New Issue
Block a user