removed one line too much

[friendica.git] / mod / p.php

diff --git a/mod/p.php b/mod/p.php
index 20d6cfdbafeb181ca263aec232a33d53722dab8a..2f69a231edf2ac21342ff0cc99699a62019538ce 100644 (file)
--- a/mod/p.php
+++ b/mod/p.php
@@ -2,79 +2,67 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
-require_once("include/diaspora.php");
+
+use Friendica\App;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Database\DBM;
+use Friendica\Protocol\Diaspora;
 
 function p_init($a){
        if ($a->argc != 2) {
-               header($_SERVER["SERVER_PROTOCOL"].' 510 '.t('Not Extended'));
+               header($_SERVER["SERVER_PROTOCOL"].' 510 '.L10n::t('Not Extended'));
                killme();
        }
 
        $guid = $a->argv[1];
 
        if (strtolower(substr($guid, -4)) != ".xml") {
-               header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+               header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
                killme();
        }
 
        $guid = strtolower(substr($guid, 0, -4));
 
-       $item = q("SELECT `title`, `body`, `guid`, `contact-id`, `private`, `created`, `app` FROM `item` WHERE `uid` = 0 AND `guid` = '%s' AND `network` IN ('%s', '%s') AND `id` = `parent` LIMIT 1",
+       // Fetch the item
+       $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);
        if (!$item) {
-               header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
+               $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(System::baseUrl())) {
+                               $location = $host."/p/".urlencode($guid).".xml";
+
+                               header("HTTP/1.1 301 Moved Permanently");
+                               header("Location:".$location);
+                               killme();
+                       }
+               }
+
+               header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
                killme();
        }
 
-       $post = array();
-
-       $reshared = diaspora::is_reshare($item[0]["body"]);
-
-       if ($reshared) {
-               $nodename = "reshare";
-               $post["root_diaspora_id"] = $reshared["root_handle"];
-               $post["root_guid"] = $reshared["root_guid"];
-               $post["guid"] = $item[0]["guid"];
-               $post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]);
-               $post["public"] = (!$item[0]["private"] ? 'true':'false');
-               $post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]);
-       } else {
-
-               $body = bb2diaspora($item[0]["body"]);
-
-               if(strlen($item[0]["title"]))
-                       $body = "## ".html_entity_decode($item[0]["title"])."\n\n".$body;
-
-               $nodename = "status_message";
-               $post["raw_message"] = str_replace("&", "&", $body);
-               $post["guid"] = $item[0]["guid"];
-               $post["diaspora_handle"] = diaspora::handle_from_contact($item[0]["contact-id"]);
-               $post["public"] = (!$item[0]["private"] ? 'true':'false');
-               $post["created_at"] = datetime_convert('UTC','UTC',$item[0]["created"]);
-               $post["provider_display_name"] = $item[0]["app"];
+       // 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` AND `contact`.`self`
+               WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
+       if (!DBM::is_result($r)) {
+               header($_SERVER["SERVER_PROTOCOL"].' 404 '.L10n::t('Not Found'));
+               killme();
        }
+       $user = $r[0];
 
-       $dom = new DOMDocument("1.0");
-       $root = $dom->createElement("XML");
-       $dom->appendChild($root);
-       $postelement = $dom->createElement("post");
-       $root->appendChild($postelement);
-       $statuselement = $dom->createElement($nodename);
-       $postelement->appendChild($statuselement);
-
-       foreach($post AS $index => $value) {
-               $postnode = $dom->createElement($index, $value);
-               $statuselement->appendChild($postnode);
-       }
+       $status = Diaspora::buildStatus($item[0], $user);
+       $xml = Diaspora::buildPostXml($status["type"], $status["message"]);
 
        header("Content-Type: application/xml; charset=utf-8");
-       $xml = $dom->saveXML();
-
-       // Diaspora doesn't send the XML header, so we remove them as well.
-       // So we avoid possible compatibility problems.
-       if (substr($xml, 0, 21) == '<?xml version="1.0"?>')
-               $xml = trim(substr($xml, 21));
-
        echo $xml;
 
        killme();