Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-28 03:10:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move remaining functions

Browse source 
update remaining function calls
This commit is contained in:
Adam Magness 2018-01-27 08:25:54 -05:00
parent 1eb7c19c1e
commit ca76e49c23
19 changed files with 58 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Protocol/DFRN.php
View file

@ -793,7 +793,7 @@ class DFRN
if ($activity) {
$entry = $doc->createElement($element);
$r = parse_xml_string($activity, false);
$r = Network::parseXmlString($activity, false);
if (!$r) {
return false;
}
@ -816,7 +816,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 = parse_xml_string("<dummy>" . $r->link . "</dummy>", false);
$data = Network::parseXmlString("<dummy>" . $r->link . "</dummy>", false);
if (is_object($data)) {
foreach ($data->link as $link) {
$attributes = [];
@ -1212,7 +1212,7 @@ class DFRN
return 3;
}
$res = parse_xml_string($xml);
$res = Network::parseXmlString($xml);
if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
return (($res->status) ? $res->status : 3);
@ -1357,7 +1357,7 @@ class DFRN
Contact::unmarkForArchival($contact);
}
$res = parse_xml_string($xml);
$res = Network::parseXmlString($xml);
if (!isset($res->status)) {
return -11;
@ -2188,7 +2188,7 @@ class DFRN
if (!$verb) {
return;
}
$xo = parse_xml_string($item["object"], false);
$xo = Network::parseXmlString($item["object"], false);
if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
@ -2310,8 +2310,8 @@ class DFRN
}
if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"], false);
$xt = parse_xml_string($item["target"], false);
$xo = Network::parseXmlString($item["object"], false);
$xt = Network::parseXmlString($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
$r = q(
@ -2518,7 +2518,7 @@ class DFRN
$item["object"] = self::transformActivity($xpath, $object, "object");
if (trim($item["object"]) != "") {
$r = parse_xml_string($item["object"], false);
$r = Network::parseXmlString($item["object"], false);
if (isset($r->type)) {
$item["object-type"] = $r->type;
}
@ -2787,8 +2787,8 @@ class DFRN
}
if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"], false);
$xt = parse_xml_string($item["target"], false);
$xo = Network::parseXmlString($item["object"], false);
$xt = Network::parseXmlString($item["target"], false);
if ($xt->type == ACTIVITY_OBJ_NOTE) {
$i = q(