the Quattro admin_user template was missing the users note for the admin

[friendica.git] / mod / p.php

diff --git a/mod/p.php b/mod/p.php
index ae25a0889eeb3ecc68923860d43ff153b950a09c..3cd7a9eb7d4676b7c631014e581d50a9eab17943 100644 (file)
--- a/mod/p.php
+++ b/mod/p.php
@@ -24,23 +24,38 @@ function p_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."/p/".urlencode($guid).".xml";
+
+                               header("HTTP/1.1 301 Moved Permanently");
+                               header("Location:".$location);
+                               killme();
+                       }
+               }
+
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
 
        // 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`
+               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
-       if (!$r) {
+       if (!dbm::is_result($r)) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
        $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);
+       $status = Diaspora::build_status($item[0], $user);
+       $xml = Diaspora::build_post_xml($status["type"], $status["message"]);
 
        header("Content-Type: application/xml; charset=utf-8");
        echo $xml;