Merge pull request #2223 from rabuzarus/2912_photo_widget

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index b98c9f7056295774c8395d894e83b85ee8f6c7b1..a3cbbfed15265c765a8bd6278e1f6c160e4f76fe 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -159,9 +159,10 @@ function mark_for_death($contact) {
        }
        else {
 
-               // TODO: We really should send a notification to the owner after 2-3 weeks
-               // so they won't be surprised when the contact vanishes and can take
-               // remedial action if this was a serious mistake or glitch
+               /// @todo 
+               /// We really should send a notification to the owner after 2-3 weeks
+               /// so they won't be surprised when the contact vanishes and can take
+               /// remedial action if this was a serious mistake or glitch
 
                $expiry = $contact['term-date'] . ' + 32 days ';
                if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
@@ -192,9 +193,6 @@ function unmark_for_death($contact) {
 }}
 
 function get_contact_details_by_url($url, $uid = -1) {
-       require_once("mod/proxy.php");
-       require_once("include/bbcode.php");
-
        if ($uid == -1)
                $uid = local_user();
 
@@ -268,15 +266,6 @@ function get_contact_details_by_url($url, $uid = -1) {
        } else
                $profile["cid"] = 0;
 
-       if (isset($profile["photo"]))
-               $profile["photo"] = proxy_url($profile["photo"], false, PROXY_SIZE_SMALL);
-
-       if (isset($profile["location"]))
-               $profile["location"] = bbcode($profile["location"]);
-
-       if (isset($profile["about"]))
-               $profile["about"] = bbcode($profile["about"]);
-
        if (($profile["cid"] == 0) AND ($profile["network"] == NETWORK_DIASPORA)) {
                $profile["location"] = "";
                $profile["about"] = "";
@@ -286,7 +275,7 @@ function get_contact_details_by_url($url, $uid = -1) {
 }
 
 if(! function_exists('contact_photo_menu')){
-function contact_photo_menu($contact) {
+function contact_photo_menu($contact, $uid = 0) {
 
        $a = get_app();
 
@@ -298,6 +287,33 @@ function contact_photo_menu($contact) {
        $contact_drop_link = "";
        $poke_link="";
 
+       if ($uid == 0)
+               $uid = local_user();
+
+       if ($contact["uid"] != $uid) {
+               if ($uid == 0) {
+                       $profile_link = zrl($contact['url']);
+                       $menu = Array('profile' => array(t("View Profile"), $profile_link, true));
+
+                       return $menu;
+               }
+
+               $r = q("SELECT * FROM `contact` WHERE `nurl` = '%s' AND `network` = '%s' AND `uid` = %d",
+                       dbesc($contact["nurl"]), dbesc($contact["network"]), intval($uid));
+               if ($r)
+                       return contact_photo_menu($r[0], $uid);
+               else {
+                       $profile_link = zrl($contact['url']);
+                       $connlnk = 'follow/?url='.$contact['url'];
+                       $menu = Array(
+                               'profile' => array(t("View Profile"), $profile_link, true),
+                               'follow' => array(t("Connect/Follow"), $connlnk, true)
+                               );
+
+                       return $menu;
+               }
+       }
+
        $sparkle = false;
        if($contact['network'] === NETWORK_DFRN) {
                $sparkle = true;
@@ -322,7 +338,7 @@ function contact_photo_menu($contact) {
                $poke_link = $a->get_baseurl() . '/poke/?f=&c=' . $contact['id'];
 
        $contact_url = $a->get_baseurl() . '/contacts/' . $contact['id'];
-       $posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id'];
+       $posts_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/posts';
        $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';