diff options
| -rw-r--r-- | include/group.php | 10 | ||||
| -rw-r--r-- | include/text.php | 4 | ||||
| -rw-r--r-- | mod/group.php | 43 |
3 files changed, 36 insertions, 21 deletions
diff --git a/include/group.php b/include/group.php index c91365896..dda432266 100644 --- a/include/group.php +++ b/include/group.php @@ -146,7 +146,7 @@ function group_add_member($uid,$name,$member,$gid = 0) { // -- It was just created at another time if(! count($r)) $r = q("INSERT INTO `group_member` (`uid`, `gid`, `xchan`) - VALUES( %d, %d, %d ) ", + VALUES( %d, %d, '%s' ) ", intval($uid), intval($gid), dbesc($member) @@ -157,11 +157,13 @@ function group_add_member($uid,$name,$member,$gid = 0) { function group_get_members($gid) { $ret = array(); if(intval($gid)) { - $r = q("SELECT abook.*,xchan.* FROM `group_member` + $r = q("SELECT abook.*,xchan.*,group_member.* FROM `group_member` LEFT JOIN abook ON abook_xchan = `group_member`.`xchan` left join xchan on xchan_hash = abook_xchan - WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY xchan_name ASC ", + WHERE `gid` = %d AND `group_member`.`uid` = %d and not ( abook_flags & %d) and not (abook_flags & %d) ORDER BY xchan_name ASC ", intval($gid), - intval(local_user()) + intval(local_user()), + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_BLOCKED) ); if(count($r)) $ret = $r; diff --git a/include/text.php b/include/text.php index 56f41d797..63bb320ff 100644 --- a/include/text.php +++ b/include/text.php @@ -549,12 +549,12 @@ function contact_block() { $micropro = Null; } else { -dbg(1); + $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash WHERE abook_channel = %d AND abook_flags = 0 ORDER BY RAND() LIMIT %d", intval($a->profile['uid']), intval($shown) ); -dbg(0); + if(count($r)) { $contacts = sprintf( tt('%d Contact','%d Contacts', $total),$total); $micropro = Array(); diff --git a/mod/group.php b/mod/group.php index 091d7119e..f62aeb554 100644 --- a/mod/group.php +++ b/mod/group.php @@ -115,15 +115,19 @@ function group_content(&$a) { // NOTREACHED } - if(($a->argc > 2) && intval($a->argv[1]) && intval($a->argv[2])) { + + if((argc() > 2) && intval(argv(1)) && argv(2)) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - - $r = q("SELECT `id` FROM `contact` WHERE `id` = %d AND `uid` = %d and `self` = 0 and `blocked` = 0 AND `pending` = 0 LIMIT 1", - intval($a->argv[2]), - intval(local_user()) + + $r = q("SELECT abook_xchan from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) limit 1", + dbesc(argv(2)), + intval(local_user()), + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_BLOCKED) ); if(count($r)) - $change = intval($a->argv[2]); + $change = argv(2); + } if(($a->argc > 1) && (intval($a->argv[1]))) { @@ -138,14 +142,19 @@ function group_content(&$a) { goaway($a->get_baseurl() . '/connnections'); } $group = $r[0]; + $members = group_get_members($group['id']); + $preselected = array(); if(count($members)) { foreach($members as $member) - $preselected[] = $member['id']; + $preselected[] = $member['xchan_hash']; } + + if($change) { + if(in_array($change,$preselected)) { group_rmv_member(local_user(),$group['name'],$change); } @@ -154,14 +163,16 @@ function group_content(&$a) { } $members = group_get_members($group['id']); + $preselected = array(); if(count($members)) { foreach($members as $member) - $preselected[] = $member['id']; + $preselected[] = $member['xchan_hash']; } } + $drop_tpl = get_markup_template('group_drop.tpl'); $drop_txt = replace_macros($drop_tpl, array( '$id' => $group['id'], @@ -195,23 +206,25 @@ function group_content(&$a) { $sec_token = addslashes(get_form_security_token('group_member_change')); $textmode = (($switchtotext && (count($members) > $switchtotext)) ? true : false); foreach($members as $member) { - if($member['url']) { - $member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . ',\'' . $sec_token . '\'); return true;'; + if($member['xchan_url']) { + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return true;'; $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode); } else - group_rmv_member(local_user(),$group['name'],$member['id']); + group_rmv_member(local_user(),$group['name'],$member['xchan_hash']); } - $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `blocked` = 0 and `pending` = 0 and `self` = 0 ORDER BY `name` ASC", - intval(local_user()) + $r = q("SELECT abook.*, xchan.* FROM `abook` left join xchan on abook_xchan = xchan_hash WHERE `abook_channel` = %d AND not (abook_flags & %d) and not (abook_flags & %d) order by xchan_name asc", + intval(local_user()), + intval(ABOOK_FLAG_BLOCKED), + intval(ABOOK_FLAG_SELF) ); if(count($r)) { $textmode = (($switchtotext && (count($r) > $switchtotext)) ? true : false); foreach($r as $member) { - if(! in_array($member['id'],$preselected)) { - $member['click'] = 'groupChangeMember(' . $group['id'] . ',' . $member['id'] . ',\'' . $sec_token . '\'); return true;'; + if(! in_array($member['xchan_hash'],$preselected)) { + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return true;'; $groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode); } } |