Merge pull request #8558 from annando/corrected-view

[friendica.git] / src / Protocol / DFRN.php

diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php
index 83010f811e073901851b8ddd8af7c42db7b71cdc..4e5aac37d990d930bbda690e221d8e2d6c3a32dd 100644 (file)
--- a/src/Protocol/DFRN.php
+++ b/src/Protocol/DFRN.php
@@ -183,19 +183,12 @@ class DFRN
 
                $sql_extra = sprintf(" AND `item`.`private` != %s ", Item::PRIVATE);
 
-               $r = q(
-                       "SELECT `contact`.*, `user`.`nickname`, `user`.`timezone`, `user`.`page-flags`, `user`.`account-type`
-                       FROM `contact` INNER JOIN `user` ON `user`.`uid` = `contact`.`uid`
-                       WHERE `contact`.`self` AND `user`.`nickname` = '%s' LIMIT 1",
-                       DBA::escape($owner_nick)
-               );
-
-               if (! DBA::isResult($r)) {
+               $owner = DBA::selectFirst('owner-view', [], ['nickname' => $owner_nick]);
+               if (!DBA::isResult($owner)) {
                        Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING);
                        exit();
                }
 
-               $owner = $r[0];
                $owner_id = $owner['uid'];
 
                $sql_post_table = "";
@@ -684,18 +677,10 @@ class DFRN
                }
 
                // Only show contact details when we are allowed to
-               $r = q(
-                       "SELECT `profile`.`about`, `profile`.`name`, `profile`.`homepage`, `user`.`nickname`,
-                               `user`.`timezone`, `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
-                               `profile`.`pub_keywords`, `profile`.`xmpp`, `profile`.`dob`
-                       FROM `profile`
-                               INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
-                               WHERE NOT `user`.`hidewall` AND `user`.`uid` = %d",
-                       intval($owner['uid'])
-               );
-               if (DBA::isResult($r)) {
-                       $profile = $r[0];
-
+               $profile = DBA::selectFirst('owner-view',
+                       ['about', 'name', 'homepage', 'nickname', 'timezone', 'locality', 'region', 'country-name', 'pub_keywords', 'xmpp', 'dob'],
+                       ['uid' => $owner['uid'], 'hidewall' => false]);
+               if (DBA::isResult($profile)) {
                        XML::addElement($doc, $author, "poco:displayName", $profile["name"]);
                        XML::addElement($doc, $author, "poco:updated", $namdate);
 
@@ -820,7 +805,7 @@ class DFRN
                if ($activity) {
                        $entry = $doc->createElement($element);
 
-                       $r = XML::parseString($activity, false);
+                       $r = XML::parseString($activity);
                        if (!$r) {
                                return false;
                        }
@@ -846,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 = [];
@@ -2116,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?
@@ -2239,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"]]);
@@ -2428,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;
                        }