Merge remote-tracking branch 'upstream/develop' into write-tags
This commit is contained in:
commit
5367620467
|
@ -747,7 +747,7 @@ class GServer
|
|||
return false;
|
||||
}
|
||||
|
||||
$xrd = XML::parseString($curlResult->getBody(), false);
|
||||
$xrd = XML::parseString($curlResult->getBody());
|
||||
if (!is_object($xrd)) {
|
||||
return false;
|
||||
}
|
||||
|
@ -796,13 +796,13 @@ class GServer
|
|||
DBA::close($gcontacts);
|
||||
|
||||
$apcontacts = DBA::select('apcontact', ['url'], ['baseurl' => [$url, $serverdata['nurl']]]);
|
||||
while ($gcontact = DBA::fetch($gcontacts)) {
|
||||
while ($apcontact = DBA::fetch($apcontacts)) {
|
||||
$contacts[Strings::normaliseLink($apcontact['url'])] = $apcontact['url'];
|
||||
}
|
||||
DBA::close($apcontacts);
|
||||
|
||||
$pcontacts = DBA::select('contact', ['url', 'nurl'], ['uid' => 0, 'baseurl' => [$url, $serverdata['nurl']]]);
|
||||
while ($gcontact = DBA::fetch($gcontacts)) {
|
||||
while ($pcontact = DBA::fetch($pcontacts)) {
|
||||
$contacts[$pcontact['nurl']] = $pcontact['url'];
|
||||
}
|
||||
DBA::close($pcontacts);
|
||||
|
|
|
@ -1249,8 +1249,8 @@ class Item
|
|||
return;
|
||||
}
|
||||
|
||||
$xo = XML::parseString($item["object"], false);
|
||||
$xt = XML::parseString($item["target"], false);
|
||||
$xo = XML::parseString($item["object"]);
|
||||
$xt = XML::parseString($item["target"]);
|
||||
|
||||
if ($xt->type != Activity\ObjectType::NOTE) {
|
||||
return;
|
||||
|
|
|
@ -206,7 +206,7 @@ class Users extends BaseAdmin
|
|||
|
||||
$e['register_date'] = Temporal::getRelativeDate($e['register_date']);
|
||||
$e['login_date'] = Temporal::getRelativeDate($e['login_date']);
|
||||
$e['last-item'] = Temporal::getRelativeDate($e['last-item']);
|
||||
$e['lastitem_date'] = Temporal::getRelativeDate($e['last-item']);
|
||||
$e['is_admin'] = in_array($e['email'], $adminlist);
|
||||
$e['is_deletable'] = (intval($e['uid']) != local_user());
|
||||
$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);
|
||||
|
|
|
@ -160,7 +160,7 @@ class Probe
|
|||
$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
|
||||
if ($curlResult->isSuccess()) {
|
||||
$xml = $curlResult->getBody();
|
||||
$xrd = XML::parseString($xml, false);
|
||||
$xrd = XML::parseString($xml, true);
|
||||
if (!empty($url)) {
|
||||
$host_url = 'https://' . $host;
|
||||
} else {
|
||||
|
@ -185,7 +185,7 @@ class Probe
|
|||
}
|
||||
|
||||
$xml = $curlResult->getBody();
|
||||
$xrd = XML::parseString($xml, false);
|
||||
$xrd = XML::parseString($xml, true);
|
||||
$host_url = 'http://'.$host;
|
||||
}
|
||||
if (!is_object($xrd)) {
|
||||
|
@ -936,7 +936,7 @@ class Probe
|
|||
}
|
||||
|
||||
// If it is not JSON, maybe it is XML
|
||||
$xrd = XML::parseString($data, false);
|
||||
$xrd = XML::parseString($data, true);
|
||||
if (!is_object($xrd)) {
|
||||
Logger::log("No webfinger data retrievable for ".$url, Logger::DEBUG);
|
||||
return false;
|
||||
|
|
|
@ -1405,8 +1405,8 @@ class Transmitter
|
|||
*/
|
||||
private static function createAddTag($item, $data)
|
||||
{
|
||||
$object = XML::parseString($item['object'], false);
|
||||
$target = XML::parseString($item["target"], false);
|
||||
$object = XML::parseString($item['object']);
|
||||
$target = XML::parseString($item["target"]);
|
||||
|
||||
$data['diaspora:guid'] = $item['guid'];
|
||||
$data['actor'] = $item['author-link'];
|
||||
|
|
|
@ -805,7 +805,7 @@ class DFRN
|
|||
if ($activity) {
|
||||
$entry = $doc->createElement($element);
|
||||
|
||||
$r = XML::parseString($activity, false);
|
||||
$r = XML::parseString($activity);
|
||||
if (!$r) {
|
||||
return false;
|
||||
}
|
||||
|
@ -831,7 +831,7 @@ class DFRN
|
|||
$r->link = preg_replace('/\<link(.*?)\"\>/', '<link$1"/>', $r->link);
|
||||
|
||||
// XML does need a single element as root element so we add a dummy element here
|
||||
$data = XML::parseString("<dummy>" . $r->link . "</dummy>", false);
|
||||
$data = XML::parseString("<dummy>" . $r->link . "</dummy>");
|
||||
if (is_object($data)) {
|
||||
foreach ($data->link as $link) {
|
||||
$attributes = [];
|
||||
|
@ -2101,7 +2101,7 @@ class DFRN
|
|||
if (!$verb) {
|
||||
return;
|
||||
}
|
||||
$xo = XML::parseString($item["object"], false);
|
||||
$xo = XML::parseString($item["object"]);
|
||||
|
||||
if (($xo->type == Activity\ObjectType::PERSON) && ($xo->id)) {
|
||||
// somebody was poked/prodded. Was it me?
|
||||
|
@ -2224,8 +2224,8 @@ class DFRN
|
|||
}
|
||||
|
||||
if (($item["verb"] == Activity::TAG) && ($item["object-type"] == Activity\ObjectType::TAGTERM)) {
|
||||
$xo = XML::parseString($item["object"], false);
|
||||
$xt = XML::parseString($item["target"], false);
|
||||
$xo = XML::parseString($item["object"]);
|
||||
$xt = XML::parseString($item["target"]);
|
||||
|
||||
if ($xt->type == Activity\ObjectType::NOTE) {
|
||||
$item_tag = Item::selectFirst(['id', 'uri-id', 'tag'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
|
||||
|
@ -2413,7 +2413,7 @@ class DFRN
|
|||
$item["object"] = self::transformActivity($xpath, $object, "object");
|
||||
|
||||
if (trim($item["object"]) != "") {
|
||||
$r = XML::parseString($item["object"], false);
|
||||
$r = XML::parseString($item["object"]);
|
||||
if (isset($r->type)) {
|
||||
$item["object-type"] = $r->type;
|
||||
}
|
||||
|
|
|
@ -323,7 +323,7 @@ class Diaspora
|
|||
*/
|
||||
private static function verifyMagicEnvelope($envelope)
|
||||
{
|
||||
$basedom = XML::parseString($envelope);
|
||||
$basedom = XML::parseString($envelope, true);
|
||||
|
||||
if (!is_object($basedom)) {
|
||||
Logger::log("Envelope is no XML file");
|
||||
|
@ -449,7 +449,7 @@ class Diaspora
|
|||
$xml = $raw;
|
||||
}
|
||||
|
||||
$basedom = XML::parseString($xml);
|
||||
$basedom = XML::parseString($xml, true);
|
||||
|
||||
if (!is_object($basedom)) {
|
||||
Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);
|
||||
|
|
|
@ -433,18 +433,26 @@ class XML
|
|||
}
|
||||
}
|
||||
|
||||
public static function parseString($s, $strict = true)
|
||||
/**
|
||||
* Parse XML string
|
||||
*
|
||||
* @param string $s
|
||||
* @param boolean $suppress_log
|
||||
* @return Object
|
||||
*/
|
||||
public static function parseString(string $s, bool $suppress_log = false)
|
||||
{
|
||||
// the "strict" parameter is deactivated
|
||||
libxml_use_internal_errors(true);
|
||||
|
||||
$x = @simplexml_load_string($s);
|
||||
if (!$x) {
|
||||
Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
|
||||
foreach (libxml_get_errors() as $err) {
|
||||
Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
|
||||
if (!$suppress_log) {
|
||||
Logger::error('Error(s) while parsing XML string.', ['callstack' => System::callstack()]);
|
||||
foreach (libxml_get_errors() as $err) {
|
||||
Logger::info('libxml error', ['code' => $err->code, 'position' => $err->line . ":" . $err->column, 'message' => $err->message]);
|
||||
}
|
||||
Logger::debug('Erroring XML string', ['xml' => $s]);
|
||||
}
|
||||
Logger::debug('Erroring XML string', ['xml' => $s]);
|
||||
libxml_clear_errors();
|
||||
}
|
||||
return $x;
|
||||
|
|
Loading…
Reference in a new issue