Show the profile visibility only for Friendica contacts.

[friendica.git] / mod / display.php

diff --git a/mod/display.php b/mod/display.php
index d1da53cf168ab27585e275f0494a933215e6bcc8..f483977cd4f847aebc639bbe93a4f85a499b921d 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -41,6 +41,18 @@ function display_init(&$a) {
                                $itemuid = $r[0]["uid"];
                        }
                }
+
+               // Is it an item with uid=0?
+               if ($nick == "") {
+                       $r = q("SELECT `item`.`id`, `item`.`parent`, `item`.`author-name`,
+                               `item`.`author-link`, `item`.`author-avatar`, `item`.`network`, `item`.`uid`, `item`.`body`
+                               FROM `item` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                                       AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
+                                       AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+                                       AND `item`.`private` = 0 AND `item`.`uid` = 0
+                                       AND `item`.`guid` = '%s'", $a->argv[1]);
+                               //      AND `item`.`private` = 0 AND `item`.`wall` = 1
+               }
                if (count($r)) {
                        if ($r[0]["id"] != $r[0]["parent"])
                                $r = q("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid` FROM `item`
@@ -88,25 +100,29 @@ function display_fetchauthor($a, $item) {
        $profiledata["photo"] = proxy_url($item["author-avatar"]);
        $profiledata["url"] = $item["author-link"];
        $profiledata["network"] = $item["network"];
-       $profiledata["address"] = "Ort".print_r($item, true);
 
        // Fetching further contact data from the contact table
        $r = q("SELECT `photo`, `nick`, `location`, `about` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d",
                normalise_link($profiledata["url"]), $item["uid"]);
        if (count($r)) {
                $profiledata["photo"] = proxy_url($r[0]["photo"]);
-               $profiledata["address"] = $r[0]["location"];
-               $profiledata["about"] = $r[0]["about"];
+               $profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"]));
+               $profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"]));
                if ($r[0]["nick"] != "")
                        $profiledata["nickname"] = $r[0]["nick"];
-       } else {
-               // Fetching profile data from unique contacts
-               $r = q("SELECT `avatar`, `nick` FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($profiledata["url"]));
-               if (count($r)) {
+       }
+
+       // Fetching profile data from unique contacts
+       $r = q("SELECT `avatar`, `nick`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($profiledata["url"]));
+       if (count($r)) {
+               if ($profiledata["photo"] == "")
                        $profiledata["photo"] = proxy_url($r[0]["avatar"]);
-                       if ($r[0]["nick"] != "")
-                               $profiledata["nickname"] = $r[0]["nick"];
-               }
+               if ($profiledata["address"] == "")
+                       $profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"]));
+               if ($profiledata["about"] == "")
+                       $profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"]));
+               if (($profiledata["nickname"] == "") AND ($r[0]["nick"] != ""))
+                       $profiledata["nickname"] = $r[0]["nick"];
        }
 
        // Check for a repeated message
@@ -159,6 +175,21 @@ function display_fetchauthor($a, $item) {
 
                $profiledata["nickname"] = $profiledata["name"];
                $profiledata["network"] = GetProfileUsername($profiledata["url"], "", false, true);
+
+               $profiledata["address"] = "";
+               $profiledata["about"] = "";
+
+               // Fetching profile data from unique contacts
+               if ($profiledata["url"] != "") {
+                       $r = q("SELECT `avatar`, `nick`, `location`, `about` FROM `unique_contacts` WHERE `url` = '%s'", normalise_link($profiledata["url"]));
+                       if (count($r)) {
+                               $profiledata["photo"] = proxy_url($r[0]["avatar"]);
+                               $profiledata["address"] = proxy_parse_html(bbcode($r[0]["location"]));
+                               $profiledata["about"] = proxy_parse_html(bbcode($r[0]["about"]));
+                               if ($r[0]["nick"] != "")
+                                       $profiledata["nickname"] = $r[0]["nick"];
+                       }
+               }
        }
 
        if (local_user()) {
@@ -233,6 +264,18 @@ function display_content(&$a, $update = 0) {
                                        $nick = $r[0]["nickname"];
                                }
                        }
+                       if ($nick == "") {
+                               $r = q("SELECT `item`.`id` FROM `item`
+                                       WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0
+                                               AND `item`.`allow_cid` = ''  AND `item`.`allow_gid` = ''
+                                               AND `item`.`deny_cid`  = '' AND `item`.`deny_gid`  = ''
+                                               AND `item`.`private` = 0  AND `item`.`uid` = 0
+                                               AND `item`.`guid` = '%s'", $a->argv[1]);
+                                       //      AND `item`.`private` = 0 AND `item`.`wall` = 1
+                               if (count($r)) {
+                                       $item_id = $r[0]["id"];
+                               }
+                       }
                }
        }