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

add new connection to default group when auto-accepted

Browse Source
This commit is contained in:
redmatrix 2016-06-15 05:28:16 -07:00
parent 7abfe716b4
commit ef1c01d968
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/follow.php
View File

@ -275,7 +275,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
call_hooks('follow', $arr); call_hooks('follow', $arr);
/** If there is a default group for this channel, add this member to it */ /** If there is a default group for this channel, add this connection to it */
if($default_group) { if($default_group) {
require_once('include/group.php'); require_once('include/group.php');

10
include/zot.php
View File

@ -538,6 +538,16 @@ function zot_refresh($them, $channel = null, $force = false) {
Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id'])); Zotlabs\Daemon\Master::Summon(array('Onepoll',$new_connection[0]['abook_id']));
} }
/** If there is a default group for this channel, add this connection to it */
$default_group = $channel['channel_default_group'];
if($default_group) {
require_once('include/group.php');
$g = group_rec_byhash($channel['channel_id'],$default_group);
if($g)
group_add_member($channel['channel_id'],'',$x['hash'],$g['id']);
}
unset($new_connection[0]['abook_id']); unset($new_connection[0]['abook_id']);
unset($new_connection[0]['abook_account']); unset($new_connection[0]['abook_account']);
unset($new_connection[0]['abook_channel']); unset($new_connection[0]['abook_channel']);