diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
| commit | ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (patch) | |
| tree | cf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 /mod/group.php | |
| parent | 652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (diff) | |
| parent | 409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff) | |
| download | volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.gz volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.bz2 volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/group.php')
| -rw-r--r-- | mod/group.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/group.php b/mod/group.php index 0f265f6fb..9b90b1a1a 100644 --- a/mod/group.php +++ b/mod/group.php @@ -118,14 +118,14 @@ function group_content(&$a) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); $r = q("SELECT abook_xchan from abook left join xchan on abook_xchan = xchan_hash where abook_xchan = '%s' and abook_channel = %d and not (xchan_flags & %d) and not (abook_flags & %d) and not (abook_flags & %d) limit 1", - dbesc(argv(2)), + dbesc(base64url_decode(argv(2))), intval(local_user()), intval(XCHAN_FLAGS_DELETED), intval(ABOOK_FLAG_BLOCKED), intval(ABOOK_FLAG_PENDING) ); if(count($r)) - $change = argv(2); + $change = base64url_decode(argv(2)); } @@ -204,7 +204,7 @@ function group_content(&$a) { foreach($members as $member) { if($member['xchan_url']) { $member['archived'] = (($member['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false); - $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return false;'; + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; $groupeditor['members'][] = micropro($member,true,'mpgroup', $textmode); } else @@ -223,7 +223,7 @@ function group_content(&$a) { foreach($r as $member) { if(! in_array($member['xchan_hash'],$preselected)) { $member['archived'] = (($member['abook_flags'] & ABOOK_FLAG_ARCHIVED) ? true : false); - $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . $member['xchan_hash'] . '\',\'' . $sec_token . '\'); return false;'; + $member['click'] = 'groupChangeMember(' . $group['id'] . ',\'' . base64url_encode($member['xchan_hash']) . '\',\'' . $sec_token . '\'); return false;'; $groupeditor['contacts'][] = micropro($member,true,'mpall', $textmode); } } |