Skip to content
This repository was archived by the owner on Oct 10, 2019. It is now read-only.
Closed
Changes from all commits
Commits
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
28 changes: 27 additions & 1 deletion Klarna.php
Original file line number Diff line number Diff line change
Expand Up @@ -3666,7 +3666,8 @@ protected function xmlrpc_call($method, $array)
$status = $xmlrpcresp->faultCode();

if ($status !== 0) {
throw new KlarnaException($xmlrpcresp->faultString(), $status);
$errorMessage = $this->_fixMessageEncoding($xmlrpcresp->faultString());
throw new KlarnaException($errorMessage, $status);
}

return php_xmlrpc_decode($xmlrpcresp->value());
Expand Down Expand Up @@ -4417,6 +4418,31 @@ private function _checkConfig($config = null)
}
}

/**
* Fixes originalMessage encoding
*
* @param string $originalMessage
* @param string $inputEncoding (defaults to ISO-8859-1)
* @param string $outputEncoding (defaults to UTF-8)
* @return string
*/
private function _fixMessageEncoding($originalMessage, $inputEncoding = 'ISO-8859-1', $outputEncoding = 'UTF-8')
{
if (extension_loaded('intl')) {

return UConverter::transcode($originalMessage, $outputEncoding, $inputEncoding);
}
if (extension_loaded('mbstring')) {

return mb_convert_encoding($originalMessage, $outputEncoding, $inputEncoding);
}
if (extension_loaded('iconv')) {

return iconv($inputEncoding, $outputEncoding, $originalMessage);
}

return preg_replace('#[[:^ascii:]]#', '?', $originalMessage);
}
} //End Klarna

/**
Expand Down