<?php
-/*
- * Module: dfrn_confirm
+/**
+ * @file mod/dfrn_confirm.php
+ * @brief Module: dfrn_confirm
* Purpose: Friendship acceptance for DFRN contacts
- *
+ *.
* There are two possible entry points and three scenarios.
- *
+ *.
* 1. A form was submitted by our user approving a friendship that originated elsewhere.
* This may also be called from dfrn_request to automatically approve a friendship.
*
* 2. We may be the target or other side of the conversation to scenario 1, and will
* interact with that process on our own user's behalf.
- *
+ *.
+ * @see PDF with dfrn specs: https://github.com/friendica/friendica/blob/master/spec/dfrn2.pdf
+ * You also find a graphic which describes the confirmation process at
+ * https://github.com/friendica/friendica/blob/master/spec/dfrn2_contact_confirmation.png
*/
require_once('include/enotify.php');
+require_once('include/group.php');
+require_once('include/Probe.php');
function dfrn_confirm_post(&$a,$handsfree = null) {
if(is_array($handsfree)) {
- /**
+ /*
* We were called directly from dfrn_request due to automatic friend acceptance.
* Any $_POST parameters we may require are supplied in the $handsfree array.
*
$node = $a->argv[1];
}
- /**
+ /*
*
* Main entry point. Scenario 1. Our user received a friend request notification (perhaps
* from another site) and clicked 'Approve'.
$activity = ((x($_POST,'activity')) ? intval($_POST['activity']) : 0 );
}
- /**
+ /*
*
* Ensure that dfrn_id has precedence when we go to find the contact record.
* We only want to search based on contact id if there is no dfrn_id,
logger('Confirming follower with contact_id: ' . $cid);
- /**
+ /*
*
* The other person will have been issued an ID when they first requested friendship.
* Locate their record. At this time, their record will have both pending and blocked set to 1.
if($network === NETWORK_DFRN) {
- /**
+ /*
*
* Generate a key pair for all further communications with this person.
* We have a keypair for every contact, and a site key for unknown people.
$params = array();
- /**
+ /*
*
* Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our
* site private key (person on the other end can decrypt it with our site public key).
logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA);
- /**
+ /*
*
* POST all this stuff to the other site.
* Temporarily raise the network timeout to 120 seconds because the default 60
require_once('include/Photo.php');
- $photos = import_profile_photo($contact['photo'],$uid,$contact_id);
+ update_contact_avatar($contact['photo'],$uid,$contact_id);
logger('dfrn_confirm: confirm - imported photos');
if(($relation == CONTACT_IS_SHARING) && ($duplex))
$duplex = 0;
- $r = q("UPDATE `contact` SET
- `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `rel` = %d,
+ $r = q("UPDATE `contact` SET `rel` = %d,
`name-date` = '%s',
`uri-date` = '%s',
- `avatar-date` = '%s',
`blocked` = 0,
`pending` = 0,
`duplex` = %d,
`hidden` = %d,
`network` = '%s' WHERE `id` = %d
",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
intval($new_relation),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
- dbesc(datetime_convert()),
intval($duplex),
intval($hidden),
dbesc(NETWORK_DFRN),
$poll = (($contact['poll']) ? $contact['poll'] : '');
if((! $contact['notify']) || (! $contact['poll'])) {
- $arr = lrdd($contact['url']);
+ $arr = Probe::lrdd($contact['url']);
if(count($arr)) {
foreach($arr as $link) {
if($link['@attributes']['rel'] === 'salmon')
if($duplex)
$new_relation = CONTACT_IS_FRIEND;
else
- $new_relation = CONTACT_IS_SHARING;
+ $new_relation = CONTACT_IS_FOLLOWER;
if($new_relation != CONTACT_IS_FOLLOWER)
$writable = 1;
);
- $r = q("UPDATE `contact` SET `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
- `name-date` = '%s',
+ $r = q("UPDATE `contact` SET `name-date` = '%s',
`uri-date` = '%s',
- `avatar-date` = '%s',
`notify` = '%s',
`poll` = '%s',
`blocked` = 0,
`rel` = %d
WHERE `id` = %d
",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
- dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
dbesc($notify),
if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) {
require_once('include/diaspora.php');
- $ret = diaspora_share($user[0],$r[0]);
- logger('mod_follow: diaspora_share returns: ' . $ret);
+ $ret = diaspora::send_share($user[0],$r[0]);
+ logger('share returns: ' . $ret);
}
// Send a new friend post if we are allowed to...
if(count($self)) {
$arr = array();
+ $arr['guid'] = get_guid(32);
$arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid);
$arr['uid'] = $uid;
$arr['contact-id'] = $self[0]['id'];
$BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
$arr['verb'] = ACTIVITY_FRIEND;
- $arr['object-type'] = ACTIVITY_OBJ_PERSON;
+ $arr['object-type'] = ACTIVITY_OBJ_PERSON;
$arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
$i = item_store($arr);
if($i)
- proc_run('php',"include/notifier.php","activity","$i");
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
}
}
}
-
- $g = q("select def_gid from user where uid = %d limit 1",
- intval($uid)
- );
- if($contact && $g && intval($g[0]['def_gid'])) {
- require_once('include/group.php');
- group_add_member($uid,'',$contact['id'],$g[0]['def_gid']);
- }
+ $def_gid = get_default_group($uid, $contact["network"]);
+ if($contact && intval($def_gid))
+ group_add_member($uid, '', $contact['id'], $def_gid);
// Let's send our user to the contact editor in case they want to
// do anything special with this new friend.
//NOTREACHED
}
- /**
+ /*
*
*
* End of Scenario 1. [Local confirmation of remote friend request].
require_once("include/Photo.php");
- $photos = import_profile_photo($photo,$local_uid,$dfrn_record);
+ update_contact_avatar($photo,$local_uid,$dfrn_record);
logger('dfrn_confirm: request - photos imported');
$duplex = 0;
$r = q("UPDATE `contact` SET
- `photo` = '%s',
- `thumb` = '%s',
- `micro` = '%s',
`rel` = %d,
`name-date` = '%s',
`uri-date` = '%s',
- `avatar-date` = '%s',
`blocked` = 0,
`pending` = 0,
`duplex` = %d,
`prv` = %d,
`network` = '%s' WHERE `id` = %d
",
- dbesc($photos[0]),
- dbesc($photos[1]),
- dbesc($photos[2]),
intval($new_relation),
dbesc(datetime_convert()),
dbesc(datetime_convert()),
- dbesc(datetime_convert()),
intval($duplex),
intval($forum),
intval($prv),
$i = item_store($arr);
if($i)
- proc_run('php',"include/notifier.php","activity","$i");
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "activity", $i);
}
}