Preparation for being able to comment every public item

[friendica.git] / mod / poco.php

diff --git a/mod/poco.php b/mod/poco.php
index 5610190dc293e7b7ebb3980830fad3aa124a7aa6..2e2791fc1ee6b763c008d79364dfb4192a59d36d 100644 (file)
--- a/mod/poco.php
+++ b/mod/poco.php
@@ -4,7 +4,10 @@
 // https://web.archive.org/web/20160405005550/http://portablecontacts.net/draft-spec.html
 
 use Friendica\App;
+use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Database\DBM;
+use Friendica\Protocol\PortableContact;
 
 function poco_init(App $a) {
        $system_mode = false;
@@ -18,7 +21,7 @@ function poco_init(App $a) {
        }
        if (! x($user)) {
                $c = q("SELECT * FROM `pconfig` WHERE `cat` = 'system' AND `k` = 'suggestme' AND `v` = 1");
-               if (! dbm::is_result($c)) {
+               if (! DBM::is_result($c)) {
                        http_status_exit(401);
                }
                $system_mode = true;
@@ -30,9 +33,8 @@ function poco_init(App $a) {
        $global = false;
 
        if ($a->argc > 1 && $a->argv[1] === '@server') {
-               require_once 'include/socgraph.php';
                // List of all servers that this server knows
-               $ret = poco_serverlist();
+               $ret = PortableContact::serverlist();
                header('Content-type: application/json');
                echo json_encode($ret);
                killme();
@@ -60,7 +62,7 @@ function poco_init(App $a) {
                        where `user`.`nickname` = '%s' and `profile`.`is-default` = 1 limit 1",
                        dbesc($user)
                );
-               if (! dbm::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
+               if (! DBM::is_result($users) || $users[0]['hidewall'] || $users[0]['hide-friends']) {
                        http_status_exit(404);
                }
 
@@ -100,7 +102,7 @@ function poco_init(App $a) {
                        dbesc(NETWORK_STATUSNET)
                );
        }
-       if (dbm::is_result($contacts)) {
+       if (DBM::is_result($contacts)) {
                $totalResults = intval($contacts[0]['total']);
        } else {
                $totalResults = 0;
@@ -195,7 +197,7 @@ function poco_init(App $a) {
        }
 
        if (is_array($contacts)) {
-               if (dbm::is_result($contacts)) {
+               if (DBM::is_result($contacts)) {
                        foreach ($contacts as $contact) {
                                if (! isset($contact['generation'])) {
                                        if ($global) {