Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / mod / fetch.php

diff --git a/mod/fetch.php b/mod/fetch.php
index f0838af507e0433115e4aa2112d19ad357df26fc..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'));
@@ -27,11 +29,13 @@ function fetch_init($a){
                        $parts = parse_url($r[0]["author-link"]);
                        $host = $parts["scheme"]."://".$parts["host"];
 
-                       $location = $host."/fetch/".$a->argv[1]."/".$guid;
+                       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("HTTP/1.1 301 Moved Permanently");
+                               header("Location:".$location);
+                               killme();
+                       }
                }
 
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));