Merge remote-tracking branch 'upstream/master'

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 1a7a1676a79bb3925a7ad0a781d025cb863b2fa9..af77869989713c4fec3ae266b0d2859f411240e7 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -169,6 +169,7 @@ function mark_for_death($contact) {
                        q("update contact set `archive` = 1 where id = %d limit 1",
                                intval($contact['id'])
                        );
+                       q("UPDATE `item` SET `private` = 2 WHERE `contact-id` = %d AND `uid` = %d", intval($contact['id']), intval($contact['uid']));
 
                        //contact_remove($contact['id']);
 
@@ -196,6 +197,7 @@ function contact_photo_menu($contact) {
        $status_link="";
        $photos_link="";
        $posts_link="";
+       $contact_drop_link = "";
        $poke_link="";
 
        $sparkle = false;
@@ -218,16 +220,19 @@ 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/?cid=' . $contact['id'];
+       $posts_link = $a->get_baseurl() . '/network/0?nets=all&cid=' . $contact['id'];
+       $contact_drop_link = $a->get_baseurl() . "/contacts/" . $contact['id'] . '/drop?confirm=1';
+       
 
        $menu = Array(
-               t("Poke") => $poke_link,
-               t("View Status") => $status_link,
-               t("View Profile") => $profile_link,
-               t("View Photos") => $photos_link,               
-               t("Network Posts") => $posts_link, 
-               t("Edit Contact") => $contact_url,
-               t("Send PM") => $pm_url,
+               'poke' => array(t("Poke"), $poke_link),
+               'status' => array(t("View Status"), $status_link),
+               'profile' => array(t("View Profile"), $profile_link),
+               'photos' => array(t("View Photos"), $photos_link),              
+               'network' => array(t("Network Posts"), $posts_link), 
+               'edit' => array(t("Edit Contact"), $contact_url),
+               'drop' => array(t("Drop Contact"), $contact_drop_link),
+               'pm' => array(t("Send PM"), $pm_url),
        );
        
        
@@ -235,7 +240,7 @@ function contact_photo_menu($contact) {
        
        call_hooks('contact_photo_menu', $args);
        
-       $o = "";
+/*     $o = "";
        foreach($menu as $k=>$v){
                if ($v!="") {
                        if(($k !== t("Network Posts")) && ($k !== t("Send PM")) && ($k !== t('Edit Contact')))
@@ -244,7 +249,16 @@ function contact_photo_menu($contact) {
                                $o .= "<li><a href=\"$v\">$k</a></li>\n";
                }
        }
-       return $o;
+       return $o;*/
+       foreach($menu as $k=>$v){
+               if ($v[1]!="") {
+                       if(($v[0] !== t("Network Posts")) && ($v[0] !== t("Send PM")) && ($v[0] !== t('Edit Contact')))
+                               $menu[$k][2] = 1;
+                       else
+                               $menu[$k][2] = 0;
+               }
+       }
+       return $menu;
 }}