edekakam/OpenXE
1
0
Fork 0
mirror of https://github.com/OpenXE-org/OpenXE.git synced 2025-04-17 09:53:11 +02:00
Code Issues Projects Releases Wiki Activity

Ticket system / sendmail, changes to response citation and html chars handling

Browse Source
This commit is contained in:
Xenomporio 2022-08-06 10:40:58 +02:00
parent 3c1e7e0949
commit 4af7eacfd8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
www/lib/class.erpapi.php
View File

@ -32483,15 +32483,10 @@ function MailSendFinal($from,$from_name,$to,$to_name,$betreff,$text,$files="",$p
$text = $this->ReadyForPDF($text); $text = $this->ReadyForPDF($text);
$text = str_replace('€','€',$text); $text = str_replace('€','€',$text);
$texthtml = htmlspecialchars_decode( /* $text = htmlspecialchars_decode(
htmlentities($text, ENT_NOQUOTES, 'UTF-8', false) htmlentities($text, ENT_NOQUOTES, 'UTF-8', false)
, ENT_NOQUOTES , ENT_NOQUOTES
); ); */
if($texthtml!=$text)
{
$text = $texthtml;
}
if($signature) if($signature)
{ {

11
www/pages/ticket.php
View File

@ -615,7 +615,12 @@ class Ticket {
break; break;
case 'zitat': case 'zitat':
if (!empty($drafted_messages) && !empty($recv_messages)) { if (!empty($drafted_messages) && !empty($recv_messages)) {
$sql = "UPDATE ticket_nachricht SET text='".$drafted_messages[0]['text']."<br /><br />--------------------<br />".$recv_messages[0]['verfasser']." &lt;".$recv_messages[0]['mail']."&gt; (".$recv_messages[0]['zeit']."): <br />".$recv_messages[0]['text']."' WHERE id=".$drafted_messages[0]['id'];
$nl = "<br />";
$citation_info =$recv_messages[0]['zeit']." ".$recv_messages[0]['verfasser']." &lt;".$recv_messages[0]['mail']."&gt;";
$text = $drafted_messages[0]['text'].$nl.$nl.$citation_info.":".$nl."<blockquote type=\"cite\">".$recv_messages[0]['text']."</blockquote>";
$sql = "UPDATE ticket_nachricht SET text='".$text."' WHERE id=".$drafted_messages[0]['id'];
$this->app->DB->Update($sql); $this->app->DB->Update($sql);
header("Location: index.php?module=ticket&action=edit&id=$id"); header("Location: index.php?module=ticket&action=edit&id=$id");
$this->app->ExitXentral(); $this->app->ExitXentral();
@ -657,8 +662,8 @@ class Ticket {
$drafted_messages[0]['verfasser_replyto'], $drafted_messages[0]['verfasser_replyto'],
$to, $to,
$to, $to,
$drafted_messages[0]['betreff'], htmlentities($drafted_messages[0]['betreff']),
$drafted_messages[0]['text'], htmlentities($drafted_messages[0]['text']),
$files, $files,
0, 0,
true, true,