Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Header.php #502

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update Header.php #502

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 13 additions & 25 deletions src/Header.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,43 +422,31 @@ private function is_uft8($value): bool {
*
* @return mixed
*/
public function decode(mixed $value): mixed {
private function decode($value) {
if (is_array($value)) {
return $this->decodeArray($value);
}
$original_value = $value;
$decoder = $this->options['decoder']['message'];

if ($value !== null) {
if ($decoder === 'utf-8') {
$decoded_values = $this->mime_header_decode($value);
$tempValue = "";
foreach ($decoded_values as $decoded_value) {
$tempValue .= $this->convertEncoding($decoded_value->text, $decoded_value->charset);
}
if ($tempValue) {
$value = $tempValue;
} else if (extension_loaded('imap')) {
$value = \imap_utf8($value);
} else if (function_exists('iconv_mime_decode')) {
$value = iconv_mime_decode($value, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, "UTF-8");
} else {
$value = mb_decode_mimeheader($value);
}
} elseif ($decoder === 'iconv') {
$value = iconv_mime_decode($value, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, "UTF-8");
} else if ($this->is_uft8($value)) {
if ($this->isMimeEncoded($value)) {
$value = mb_decode_mimeheader($value);
}

if ($this->notDecoded($original_value, $value)) {
$value = $this->convertEncoding($original_value, $this->getEncoding($original_value));
} else {
$value = mb_convert_encoding($value, 'UTF-8', $this->getEncoding($value));
}
}

return $value;
}

/**
* Check if a string is MIME encoded
* @param string $value
* @return bool
*/
private function isMimeEncoded($value) {
return preg_match('/=\?.+\?=/', $value) === 1;
}

/**
* Decode a given array
* @param array $values
Expand Down