Update install wizard

[friendica.git] / include / Contact.php

diff --git a/include/Contact.php b/include/Contact.php
index 9ba1e8ae5cbde3b9d068018a0d6ba9d3ce7cc599..675d1c81e130ed211dd5a73fc2ce574211788153 100644 (file)
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -51,6 +51,21 @@ function user_remove($uid) {
 
 
 function contact_remove($id) {
+
+       $r = q("select uid from contact where id = %d limit 1",
+               intval($id)
+       );
+       if((! count($r)) || (! intval($r[0]['uid'])))
+               return;
+
+       $archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts');
+       if($archive) {
+               q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d limit 1",
+                       intval($id)
+               );
+               return;
+       }
+
        q("DELETE FROM `contact` WHERE `id` = %d LIMIT 1",
                intval($id)
        );
@@ -73,6 +88,49 @@ function contact_remove($id) {
 }
 
 
+// sends an unfriend message. Does not remove the contact
+
+function terminate_friendship($user,$self,$contact) {
+
+
+       $a = get_app();
+
+       require_once('include/datetime.php');
+
+       if($contact['network'] === NETWORK_OSTATUS) {
+
+               $slap = replace_macros(get_markup_template('follow_slap.tpl'), array(
+                       '$name' => $user['username'],
+                       '$profile_page' => $a->get_baseurl() . '/profile/' . $user['nickname'],
+                       '$photo' => $self['photo'],
+                       '$thumb' => $self['thumb'],
+                       '$published' => datetime_convert('UTC','UTC', 'now', ATOM_TIME),
+                       '$item_id' => 'urn:X-dfrn:' . $a->get_hostname() . ':unfollow:' . random_string(),
+                       '$title' => '',
+                       '$type' => 'text',
+                       '$content' => t('stopped following'),
+                       '$nick' => $user['nickname'],
+                       '$verb' => 'http://ostatus.org/schema/1.0/unfollow', // ACTIVITY_UNFOLLOW,
+                       '$ostat_follow' => '' // '<as:verb>http://ostatus.org/schema/1.0/unfollow</as:verb>' . "\r\n"
+               ));
+
+               if((x($contact,'notify')) && (strlen($contact['notify']))) {
+                       require_once('include/salmon.php');
+                       slapper($user,$contact['notify'],$slap);
+               }
+       }
+       elseif($contact['network'] === NETWORK_DIASPORA) {
+               require_once('include/diaspora.php');
+               diaspora_unshare($user,$contact);
+       }
+       elseif($contact['network'] === NETWORK_DFRN) {
+               require_once('include/items.php');
+               dfrn_deliver($user,$contact,'placeholder', 1);
+       }
+
+}
+
+
 // Contact has refused to recognise us as a friend. We will start a countdown.
 // If they still don't recognise us in 32 days, the relationship is over,
 // and we won't waste any more time trying to communicate with them.
@@ -151,7 +209,7 @@ function contact_photo_menu($contact) {
        );
        
        
-       $args = array('contact' => $contact, 'menu' => $menu);
+       $args = array('contact' => $contact, 'menu' => &$menu);
        
        call_hooks('contact_photo_menu', $args);