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
- `avatar` = '%s',
- `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($contact['photo']),
- 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),
);
- $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...
}
}
-
- $g = q("select def_gid from user where uid = %d limit 1",
- intval($uid)
- );
- if($contact && $g && intval($g[0]['def_gid'])) {
+ $def_gid = get_default_group($uid, $contact["network"]);
+ if($contact && intval($def_gid)) {
require_once('include/group.php');
- group_add_member($uid,'',$contact['id'],$g[0]['def_gid']);
+ group_add_member($uid, '', $contact['id'], $def_gid);
}
// Let's send our user to the contact editor in case they want to
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
- `avatar` = '%s',
- `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($photo),
- 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),