harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

prevent connecting to yourself or connecting to the same channel multiple times

Browse Source
This commit is contained in:
friendica 2012-12-25 18:48:51 -08:00
parent a4b7fe3b64
commit f2a0514917
1 changed files with 40 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
include/follow.php
View File

@ -42,8 +42,6 @@ function new_contact($uid,$url,$channel,$interactive = false) {
} }
logger('follow: ' . $url . ' ' . print_r($j,true)); logger('follow: ' . $url . ' ' . print_r($j,true));
// killme();
if(! ($j->success && $j->guid)) { if(! ($j->success && $j->guid)) {
$result['message'] = t('Unable to communicate with requested channel.'); $result['message'] = t('Unable to communicate with requested channel.');
@ -101,7 +99,38 @@ function new_contact($uid,$url,$channel,$interactive = false) {
} }
} }
if((local_user()) && $uid == local_user()) {
$aid = get_account_id();
$hash = $a->observer['xchan_hash'];
}
else {
$r = q("select * from channel where uid = %d limit 1",
intval($uid)
);
if(! $r) {
$result['message'] .= t('local account not found.');
return $result;
}
$aid = $r[0]['channel_account_id'];
$hash = $r[0]['channel_hash'];
}
if($hash == $xchan_hash) {
$result['message'] .= t('Cannot connect to yourself.');
return $result;
}
$r = q("select abook_xchan from abook_id where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($xchan_hash),
intval($uid)
);
if($r) {
$x = q("update abook set abook_their_perms = %d where abook_id = %d limit 1",
intval($their_perms),
intval($r[0]['abook_id'])
);
}
else {
$r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_their_perms, abook_created, abook_updated ) $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_their_perms, abook_created, abook_updated )
values( %d, %d, '%s', %d, '%s', '%s' ) ", values( %d, %d, '%s', %d, '%s', '%s' ) ",
intval(get_account_id()), intval(get_account_id()),
@ -111,18 +140,14 @@ function new_contact($uid,$url,$channel,$interactive = false) {
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()) dbesc(datetime_convert())
); );
}
if(! $r) if(! $r)
logger('mod_follow: abook creation failed'); logger('mod_follow: abook creation failed');
// Then send a ping/message to the other side // Then send a ping/message to the other side
/* /*
$r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`, $r = q("INSERT INTO `contact` ( `uid`, `created`, `url`, `nurl`, `addr`, `alias`, `batch`, `notify`, `poll`, `poco`, `name`, `nick`, `photo`, `network`, `pubkey`, `rel`, `priority`,