Merge pull request #3896 from tobiasd/20171110-community

[friendica.git] / mod / fetch.php

diff --git a/mod/fetch.php b/mod/fetch.php
index 753e286be75e5ba424154a78cdc835ed01f55b88..8685504fffb22f64770a272f33f52ba35c1c4f97 100644 (file)
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -2,13 +2,18 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
-require_once("include/crypto.php");
-require_once("include/diaspora.php");
-require_once("include/xml.php");
 
-function fetch_init($a){
+use Friendica\App;
+use Friendica\Core\System;
+use Friendica\Protocol\Diaspora;
+use Friendica\Util\XML;
 
-       if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
+require_once "include/crypto.php";
+
+function fetch_init(App $a)
+{
+
+       if (($a->argc != 3) || (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
@@ -16,18 +21,27 @@ function fetch_init($a){
        $guid = $a->argv[2];
 
        // Fetch the item
-       $item = q("SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
+       $item = q(
+               "SELECT `uid`, `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app`, `location`, `coord`
                        FROM `item` WHERE `wall` AND NOT `private` AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
-               dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+               dbesc($guid),
+               NETWORK_DFRN,
+               NETWORK_DIASPORA
+       );
        if (!$item) {
-               $r = q("SELECT `author-link`
+               $r = q(
+                       "SELECT `author-link`
                        FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
-                       dbesc($guid), NETWORK_DFRN, NETWORK_DIASPORA);
+                       dbesc($guid),
+                       NETWORK_DFRN,
+                       NETWORK_DIASPORA
+               );
+
                if ($r) {
                        $parts = parse_url($r[0]["author-link"]);
                        $host = $parts["scheme"]."://".$parts["host"];
 
-                       if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+                       if (normalise_link($host) != normalise_link(System::baseUrl())) {
                                $location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
 
                                header("HTTP/1.1 301 Moved Permanently");
@@ -41,9 +55,13 @@ function fetch_init($a){
        }
 
        // Fetch some data from the author (We could combine both queries - but I think this is more readable)
-       $r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
-               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
-               WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
+       $r = q(
+               "SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
+               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
+               WHERE `user`.`uid` = %d",
+               intval($item[0]["uid"])
+       );
+
        if (!$r) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();