bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-10-31 08:12:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

gui: Fix journal handling

Browse Source 
Signed-off-by: Janos SUTO <sj@acts.hu>
This commit is contained in:
Janos SUTO
2018-12-23 20:00:22 +00:00
parent 0bf20b1f66
commit 8bd4531b04
5 changed files with 62 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
webui/system/helper/mime.php
View File

@@ -87,12 +87,12 @@ class Piler_Mime_Decode {
public static function splitMessage($message, &$headers, &$body, $EOL = "\n") {
self::splitMessageRaw($message, $headers, $body);
self::splitMessageRaw($message, $headers, $journal, $body);
$headers = self::splitHeaders($headers);
}
public static function splitMessageRaw($message, &$headers, &$body, $EOL = "\n") {
public static function splitMessageRaw($message, &$headers, &$journal, &$body, $EOL = "\n") {
$headers = [];
$body = '';
@@ -102,6 +102,27 @@ class Piler_Mime_Decode {
if(strpos($message, $EOL . $EOL)) {
list($headers, $body) = explode($EOL . $EOL, $message, 2);
// Check if the header is actually a journal header
$headers_array = self::splitHeaders($headers);
if(isset($headers_array['x-ms-journal-report']) && isset($headers_array['content-type']['boundary'])) {
$boundary = $headers_array['content-type']['boundary'];
$parts = self::splitMime($body, $boundary);
if(count($parts) >= 2) {
self::splitMessageRaw($parts[0], $s, $j, $journal);
$i = strpos($parts[1], "\n");
$msg = substr($parts[1], $i);
$i = 0;
while(ctype_space($msg[$i])) { $i++; }
if($i > 0) { $msg = substr($msg, $i); }
self::splitMessageRaw($msg, $headers, $j, $body);
}
}
}
else {
$headers = $message;
@@ -109,6 +130,32 @@ class Piler_Mime_Decode {
}
public static function removeJournal(&$message, $EOL = '\n') {
$has_journal = 0;
$s = self::remove_LF($message);
if(strpos($s, $EOL . $EOL)) {
list($headers, $body) = explode($EOL . $EOL, $s, 2);
if(strstr($headers, "\nX-MS-Journal-Report:")) {
return $has_journal;
}
}
$p = strstr($message, "\nX-MS-Journal-Report:");
if($p) {
$q = stristr($p, "message/rfc822");
if($q) {
$has_journal = 1;
$i = strlen("message/rfc822");
while(ctype_space($q[$i])) { $i++; }
if($i > 0) { $message = substr($q, $i); }
}
}
return $has_journal;
}
public static function splitHeaders($headers) {
$headers = self::headersToArray($headers);