|
@@ 1667-1667 (lines=1) @@
|
| 1664 |
|
#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body']); |
| 1665 |
|
$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>"; |
| 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 (HTML) 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?"<br>":""). $bodyParts[$i]['body'] ; |
|
@@ 1681-1681 (lines=1) @@
|
| 1678 |
|
if($i>0) { |
| 1679 |
|
$this->sessionData['body'] .= "<hr>"; |
| 1680 |
|
} |
| 1681 |
|
if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']); |
| 1682 |
|
$bodyParts[$i]['body'] = Api\Translation::convert_jsonsafe($bodyParts[$i]['body'], $bodyParts[$i]['charSet']); |
| 1683 |
|
#error_log( "GetDraftData (Plain) CharSet".mb_detect_encoding($bodyParts[$i]['body'] . 'a' , strtoupper($bodyParts[$i]['charSet']).','.strtoupper($this->displayCharset).',UTF-8, ISO-8859-1')); |
| 1684 |
|
$this->sessionData['body'] .= ($i>0?"\r\n":""). $bodyParts[$i]['body'] ; |
|
@@ 2142-2142 (lines=1) @@
|
| 2139 |
|
#$bodyParts[$i]['body'] = nl2br($bodyParts[$i]['body'])."<br>"; |
| 2140 |
|
$bodyParts[$i]['body'] = "<pre>".$bodyParts[$i]['body']."</pre>"; |
| 2141 |
|
} |
| 2142 |
|
if ($bodyParts[$i]['charSet']===false) $bodyParts[$i]['charSet'] = Mail::detect_encoding($bodyParts[$i]['body']); |
| 2143 |
|
|
| 2144 |
|
$_htmlConfig = Mail::$htmLawed_config; |
| 2145 |
|
Mail::$htmLawed_config['comment'] = 2; |