Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / fetch.php

diff --git a/mod/fetch.php b/mod/fetch.php
index 5db6250a214143d7c502f62e0df11cef4b5cbfd2..bf27ffb6a6d7bb5218b0e524f01886e53d5c7f15 100644 (file)
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -6,7 +6,9 @@ require_once("include/crypto.php");
 require_once("include/diaspora.php");
 require_once("include/xml.php");
 
-function fetch_init($a){
+/// @TODO You always make it like this: function foo(&$a)
+/// @TODO This means that the value of $a can be changed in anything, remove & and use App as type-hint
+function fetch_init(App &$a){
 
        if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
@@ -20,6 +22,22 @@ function fetch_init($a){
                        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);
        if (!$item) {
+               $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);
+               if ($r) {
+                       $parts = parse_url($r[0]["author-link"]);
+                       $host = $parts["scheme"]."://".$parts["host"];
+
+                       if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+                               $location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
+
+                               header("HTTP/1.1 301 Moved Permanently");
+                               header("Location:".$location);
+                               killme();
+                       }
+               }
+
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
@@ -35,16 +53,11 @@ function fetch_init($a){
        $user = $r[0];
 
        $status = diaspora::build_status($item[0], $user);
-       $data = array("XML" => array("post" => array($status["type"] => $status["message"])));
-       $xml = xml::from_array($data, $xmlobj);
+       $xml = diaspora::build_post_xml($status["type"], $status["message"]);
 
        // Send the envelope
        header("Content-Type: application/magic-envelope+xml; charset=utf-8");
        echo diaspora::build_magic_envelope($xml, $user);
 
-       //header("Content-Type: application/xml; charset=utf-8");
-       //echo $xml;
-       //killme();
-
        killme();
 }