if($request_id) {
- $r = q("SELECT `id` FROM `intro`
+ $r = q("SELECT * FROM `intro`
WHERE `id` = %d
AND `uid` = %d LIMIT 1",
intval($request_id),
if(count($r)) {
$intro_id = $r[0]['id'];
+ $contact_id = $r[0]['contact-id'];
}
else {
notice( t('Invalid request identifier.') . EOL);
$r = q("DELETE FROM `intro` WHERE `id` = %d LIMIT 1",
intval($intro_id)
);
- $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($request_id),
+ $r = q("DELETE FROM `contact` WHERE `id` = %d AND `uid` = %d AND `self` = 0 LIMIT 1",
+ intval($contact_id),
intval(local_user())
);
return;
foreach($r as $rr) {
- $friend_selected = (($rr['network'] === 'dfrn') ? ' checked="checked" ' : ' disabled ');
+ $friend_selected = (($rr['network'] !== 'stat') ? ' checked="checked" ' : ' disabled ');
$fan_selected = (($rr['network'] === 'stat') ? ' checked="checked" disabled ' : '');
$dfrn_tpl = load_view_file('view/netfriend.tpl');
$knowyou = '';
$dfrn_text = '';
- if($rr['network'] === 'dfrn') {
+ if($rr['network'] !== 'stat') {
$knowyou = t('Claims to be known to you: ') . (($rr['knowyou']) ? t('yes') : t('no'));
$dfrn_text = replace_macros($dfrn_tpl,array(
$o .= replace_macros($tpl,array(
- '$notify_type' => (($rr['network'] === 'dfrn') ? t('Friend/Connect Request') : t('New Follower')),
+ '$str_notifytype' => t('Notification type: '),
+ '$notify_type' => (($rr['network'] !== 'stat') ? t('Friend/Connect Request') : t('New Follower')),
'$dfrn_text' => $dfrn_text,
'$dfrn_id' => $rr['issued-id'],
'$uid' => $_SESSION['uid'],
'$fullname' => $rr['name'],
'$url' => $rr['url'],
'$knowyou' => $knowyou,
+ '$approve' => t('Approve'),
'$note' => $rr['note']
));
}