mag/WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

workign comments strucuture

Browse Source
This commit is contained in:
Mark Gregory
2026-06-17 10:29:02 +01:00
parent d1b120acf5
commit 26e428cd5f
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Modules/Helpdesk/Http/Controllers/TicketCommentStoreController.php
+2 -2
View File
@@ -54,10 +54,10 @@ final class TicketCommentStoreController extends Controller
->where('is_active', true)
->findOrFail((int) $validated['canned_response_id']);
$body = trim($renderer->render($response->body, $ticket, $user));
$body = trim($response->body);
}
$body = $this->normaliseHtmlBody($body);
$body = $this->normaliseHtmlBody($renderer->render($body, $ticket, $user));
validator(['commentBody' => $body], [
'commentBody' => ['required', 'string', 'min:2'],
Modules/Helpdesk/Resources/views/partials/comment-thread.blade.php
+25 -1
View File
@@ -12,6 +12,30 @@
$isInternal = (bool) $comment->is_internal;
$borderClass = $isInternal ? 'border-amber-300 dark:border-amber-700' : 'border-red-200 dark:border-red-900/70';
$railClass = $isInternal ? 'bg-amber-500' : 'bg-red-500';
$renderedBody = (string) $comment->body;
if ($currentTicket !== null) {
$renderedBody = strtr($renderedBody, [
'{{ ticket.reference }}' => e((string) ($currentTicket->reference ?? '')),
'{{ ticket.subject }}' => e((string) ($currentTicket->subject ?? '')),
'{{ ticket.status }}' => e((string) ($currentTicket->status?->name ?? '')),
'{{ ticket.priority }}' => e((string) ($currentTicket->priority?->name ?? '')),
'{{ ticket.category }}' => e((string) ($currentTicket->category?->name ?? '')),
'{{ ticket.project }}' => e((string) ($currentTicket->project?->title ?? '')),
'{{ ticket.team }}' => e((string) ($currentTicket->team?->name ?? '')),
'{{ requester.name }}' => e((string) ($currentTicket->owner?->name ?? $currentTicket->user?->name ?? '')),
'{{ agent.name }}' => e((string) ($currentTicket->agent?->name ?? '')),
'{{ actor.name }}' => e((string) ($commentUser?->name ?? '')),
'{{ ticket.url }}' => e(route('helpdesk.tickets.show', ['ticket' => $currentTicket->getKey()])),
]);
}
$containsHtml = $renderedBody !== strip_tags($renderedBody);
$renderedBody = preg_replace('/<\s*(script|style)[^>]*>.*?<\s*\/\s*\1\s*>/is', '', $renderedBody) ?: '';
$renderedBody = preg_replace('/\s+on[a-z]+\s*=\s*("[^"]*"|\'[^\']*\'|[^\s>]+)/i', '', $renderedBody) ?: '';
$renderedBody = preg_replace('/javascript\s*:/i', '', $renderedBody) ?: '';
$renderedBody = strip_tags($renderedBody, '<p><br><strong><b><em><i><u><ul><ol><li><blockquote><pre><code><a>');
$renderedBody = $containsHtml ? $renderedBody : nl2br(e($renderedBody));
@endphp
@if (! $isInternal || $canSeeInternalNotes)
@@ -51,7 +75,7 @@
<div class="border-t border-zinc-100 px-4 pb-4 pt-3 dark:border-zinc-800">
<div class="prose prose-sm max-w-none dark:prose-invert">
{!! $comment->body !!}
{!! $renderedBody !!}
</div>
@if ($commentAttachments->isNotEmpty())