Skip to content

Refactor ensureUtf8 to handle exceptions and improve logic #33

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

Merged
ralflang merged 1 commit into from
May 25, 2026
Merged

Refactor ensureUtf8 to handle exceptions and improve logic #33

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
54 changes: 32 additions & 22 deletions lib/Horde/ActiveSync/Utils.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,35 +218,45 @@ public static function createGoid($uid, $options = [])
*/
public static function ensureUtf8($data, $from_charset)
{
$text = Horde_String::convertCharset($data, $from_charset, 'UTF-8');
if (!Horde_String::validUtf8($text)) {
$test_charsets = [
'windows-1252',
'UTF-8',
];
foreach ($test_charsets as $charset) {
if ($charset != $from_charset) {
try {
$text = Horde_String::convertCharset($data, $from_charset, 'UTF-8');
if (Horde_String::validUtf8($text)) {
return $text;
}
} catch (RuntimeException $e) {
// Fall through to alternate charsets below.
}

$test_charsets = [
'windows-1252',
'UTF-8',
];
foreach ($test_charsets as $charset) {
if ($charset != $from_charset) {
try {
$text = Horde_String::convertCharset($data, $charset, 'UTF-8');
if (Horde_String::validUtf8($text)) {
return $text;
}
} catch (RuntimeException $e) {
}
}
// Invalid UTF-8 still found. Strip out non 7-bit characters, or if
// that fails, force a conversion to UTF-8 as a last resort. Need
// to break string into smaller chunks to avoid hitting
// https://bugs.php.net/bug.php?id=37793
$chunk_size = 4000;
$text = '';
while ($data !== false && strlen($data)) {
$test = self::_stripNon7BitChars(substr($data, 0, $chunk_size));
if ($test !== false) {
$text .= $test;
} else {
return Horde_String::convertCharset($data, $from_charset, 'UTF-8', true);
}
$data = substr($data, $chunk_size);
}

// Invalid UTF-8 still found. Strip out non 7-bit characters, or if
// that fails, force a conversion to UTF-8 as a last resort. Need
// to break string into smaller chunks to avoid hitting
// https://bugs.php.net/bug.php?id=37793
$chunk_size = 4000;
$text = '';
while ($data !== false && strlen($data)) {
$test = self::_stripNon7BitChars(substr($data, 0, $chunk_size));
if ($test !== false) {
$text .= $test;
} else {
return Horde_String::convertCharset($data, $from_charset, 'UTF-8', true);
}
$data = substr($data, $chunk_size);
}

return $text;
Expand Down
Loading