Skip to content

zrusena funkcia isValidXmlString($xmlString) #4

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
thorewi merged 2 commits into from
Feb 27, 2017
Merged

zrusena funkcia isValidXmlString($xmlString) #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d7b6d6
Feb 27, 2017
c3fc8f2
Feb 27, 2017
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
27 changes: 3 additions & 24 deletions src/SmartEmailing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,10 @@ protected function callSmartemailingApiWithCurl($data) {
return $this->getErrorXml($e->getCode(), $e->getMessage());
}

$xml = simplexml_load_string($response);

if ($this->isValidXmlString($response)) {
return new \SimpleXMLElement($response);

if ($xml !== FALSE) {
return $xml;
} else {
return $this->getErrorXml('500', 'Unknown Smartemailing API error.');
}
Expand All @@ -319,25 +319,4 @@ public function getErrorXml($code, $message) {
return $xml;
}


/**
* check if xml string is valid
*
* @param string $xmlString
* @return bool
*/
protected function isValidXmlString($xmlString) {
libxml_use_internal_errors(TRUE);

$doc = simplexml_load_string($xmlString);

if (!$doc) {
$errors = libxml_get_errors();

return empty($errors);
}

return FALSE;
}

}