diff --git a/Web/Models/Entities/Ticket.php b/Web/Models/Entities/Ticket.php index daef26bc..dbeaca9e 100644 --- a/Web/Models/Entities/Ticket.php +++ b/Web/Models/Entities/Ticket.php @@ -11,8 +11,9 @@ use Nette\Database\Table\Selection; class Ticket extends RowModel { - protected $tableName = "tickets"; + + private $overrideContentColumn = "text"; function getId(): int { diff --git a/Web/Models/Entities/TicketComment.php b/Web/Models/Entities/TicketComment.php index 9cbc4716..ae724831 100644 --- a/Web/Models/Entities/TicketComment.php +++ b/Web/Models/Entities/TicketComment.php @@ -13,6 +13,8 @@ class TicketComment extends RowModel { protected $tableName = "tickets_comments"; + private $overrideContentColumn = "text"; + private function getSupportAlias(): ?SupportAlias { return (new SupportAliases)->get($this->getUser()->getId()); diff --git a/Web/Models/Entities/Traits/TRichText.php b/Web/Models/Entities/Traits/TRichText.php index faec0bca..62ba547b 100644 --- a/Web/Models/Entities/Traits/TRichText.php +++ b/Web/Models/Entities/Traits/TRichText.php @@ -49,8 +49,10 @@ trait TRichText function getText(bool $html = true): string { - $text = htmlentities($this->getRecord()->content, ENT_DISALLOWED | ENT_XHTML); - $proc = iconv_strlen($this->getRecord()->content) <= OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["postSizes"]["processingLimit"]; + $contentColumn = property_exists($this, "overrideContentColumn") ? $this->overrideContentColumn : "content"; + + $text = htmlentities($this->getRecord()->{$contentColumn}, ENT_DISALLOWED | ENT_XHTML); + $proc = iconv_strlen($this->getRecord()->{$contentColumn}) <= OPENVK_ROOT_CONF["openvk"]["preferences"]["wall"]["postSizes"]["processingLimit"]; if($html) { if($proc) { $rel = $this->isAd() ? "sponsored" : "ugc"; diff --git a/Web/Presenters/templates/Support/AnswerTicket.xml b/Web/Presenters/templates/Support/AnswerTicket.xml index 8b3f9313..200b8ca2 100644 --- a/Web/Presenters/templates/Support/AnswerTicket.xml +++ b/Web/Presenters/templates/Support/AnswerTicket.xml @@ -15,7 +15,7 @@
Автор: {$ticket->getUser()->getFullName()} | {$ticket->getUser()->getRegistrationIP()} | Статус: {$ticket->getStatus()}
- {$ticket->getContext()|noescape} + {$ticket->getText()|noescape}

@@ -82,7 +82,7 @@ {/if}
- {$comment->getContext()|noescape} + {$comment->getText()|noescape}
{if $comment->getUType() === 0}
diff --git a/Web/Presenters/templates/Support/View.xml b/Web/Presenters/templates/Support/View.xml index 46c372b1..8031378c 100644 --- a/Web/Presenters/templates/Support/View.xml +++ b/Web/Presenters/templates/Support/View.xml @@ -16,7 +16,7 @@
Статус: {$ticket->getStatus()}
- {$ticket->getContext()|noescape} + {$ticket->getText()|noescape}

@@ -74,7 +74,7 @@ {/if}
- {$comment->getContext()|noescape} + {$comment->getText()|noescape}
{if $comment->getUType() === 0}