modified: view/theme/smoothly/style.css

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 675d1c81e130ed211dd5a73fc2ce574211788153..ecc271a8e0bf6242b99c33fbb613b8fe3ac6673a 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -139,6 +139,10 @@ function terminate_friendship($user,$self,$contact) {
  
 if(! function_exists('mark_for_death')) {
 function mark_for_death($contact) {
+
+       if($contact['archive'])
+               return;
+
        if($contact['term-date'] == '0000-00-00 00:00:00') {
                q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1",
                                dbesc(datetime_convert()),
@@ -146,12 +150,23 @@ 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
+
                $expiry = $contact['term-date'] . ' + 32 days ';
                if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) {
 
                        // relationship is really truly dead. 
+                       // archive them rather than delete
+                       // though if the owner tries to unarchive them we'll start the whole process over again
+
+                       q("update contact set `archive` = 1 where id = %d limit 1",
+                               intval($contact['id'])
+                       );
 
-                       contact_remove($contact['id']);
+                       //contact_remove($contact['id']);
 
                }
        }
@@ -177,6 +192,7 @@ function contact_photo_menu($contact) {
        $status_link="";
        $photos_link="";
        $posts_link="";
+       $poke_link="";
 
        $sparkle = false;
        if($contact['network'] === NETWORK_DFRN) {
@@ -196,10 +212,12 @@ function contact_photo_menu($contact) {
                $pm_url = $a->get_baseurl() . '/message/new/' . $contact['id'];
        }
 
+       $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'];
 
        $menu = Array(
+               t("Poke") => $poke_link,
                t("View Status") => $status_link,
                t("View Profile") => $profile_link,
                t("View Photos") => $photos_link,