|
@@ 1653-1653 (lines=1) @@
|
| 1650 |
|
#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body']); |
| 1651 |
|
$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>"; |
| 1652 |
|
} |
| 1653 |
|
if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']); |
| 1654 |
|
$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']); |
| 1655 |
|
#error_log( "GetDraftData (HTML) CharSet:".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1')); |
| 1656 |
|
$this->sessionData['body'] .= ($i>0?"<br>":""). $bodyParts[$i]['body'] ; |
|
@@ 1667-1667 (lines=1) @@
|
| 1664 |
|
if($i>0) { |
| 1665 |
|
$this->sessionData['body'] .= "<hr>"; |
| 1666 |
|
} |
| 1667 |
|
if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']); |
| 1668 |
|
$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']); |
| 1669 |
|
#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1')); |
| 1670 |
|
$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ; |
|
@@ 2116-2116 (lines=1) @@
|
| 2113 |
|
#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body'])."<br>"; |
| 2114 |
|
$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>"; |
| 2115 |
|
} |
| 2116 |
|
if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']); |
| 2117 |
|
|
| 2118 |
|
$_htmlConfig = Mail::$htmLawed_config; |
| 2119 |
|
Mail::$htmLawed_config['comment'] = 2; |