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

groups now take xchans, so you can have groups containing channels that you aren't connected with

Browse Source
This commit is contained in:
friendica 2012-11-14 18:18:28 -08:00
parent 0ace91bd0e
commit fcb89c6311
3 changed files with 38 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
done
View File

@ -39,7 +39,7 @@ include/
fcontact.php fcontact.php
follow.php follow.php
gprobe.php gprobe.php
group.php + group.php
html2bbcode.php html2bbcode.php
html2plain.php html2plain.php
+ identity.php + identity.php

75
include/group.php
View File

@ -50,31 +50,32 @@ function group_rmv($uid,$name) {
return false; return false;
// remove group from default posting lists // remove group from default posting lists
$r = q("SELECT def_gid, allow_gid, deny_gid FROM user WHERE uid = %d LIMIT 1", $r = q("SELECT channel_default_gid, channel_allow_gid, channel_deny_gid FROM channel WHERE channel_id = %d LIMIT 1",
intval($uid) intval($uid)
); );
if($r) { if($r) {
$user_info = $r[0]; $user_info = $r[0];
$change = false; $change = false;
if($user_info['def_gid'] == $group_id) { if($user_info['channel_default_gid'] == $group_id) {
$user_info['def_gid'] = 0; $user_info['channel_default_gid'] = 0;
$change = true; $change = true;
} }
if(strpos($user_info['allow_gid'], '<' . $group_id . '>') !== false) { if(strpos($user_info['channel_allow_gid'], '<' . $group_id . '>') !== false) {
$user_info['allow_gid'] = str_replace('<' . $group_id . '>', '', $user_info['allow_gid']); $user_info['channel_allow_gid'] = str_replace('<' . $group_id . '>', '', $user_info['channel_allow_gid']);
$change = true; $change = true;
} }
if(strpos($user_info['deny_gid'], '<' . $group_id . '>') !== false) { if(strpos($user_info['channel_deny_gid'], '<' . $group_id . '>') !== false) {
$user_info['deny_gid'] = str_replace('<' . $group_id . '>', '', $user_info['deny_gid']); $user_info['channel_deny_gid'] = str_replace('<' . $group_id . '>', '', $user_info['channel_deny_gid']);
$change = true; $change = true;
} }
if($change) { if($change) {
q("UPDATE user SET def_gid = %d, allow_gid = '%s', deny_gid = '%s' WHERE uid = %d", q("UPDATE channel SET channel_default_gid = %d, channel_allow_gid = '%s', channel_deny_gid = '%s'
intval($user_info['def_gid']), WHERE channel_id = %d",
dbesc($user_info['allow_gid']), intval($user_info['channel_default_gid']),
dbesc($user_info['deny_gid']), dbesc($user_info['channel_allow_gid']),
dbesc($user_info['channel_deny_gid']),
intval($uid) intval($uid)
); );
} }
@ -117,10 +118,10 @@ function group_rmv_member($uid,$name,$member) {
return false; return false;
if(! ( $uid && $gid && $member)) if(! ( $uid && $gid && $member))
return false; return false;
$r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1 ", $r = q("DELETE FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND xchan = '%s' LIMIT 1 ",
intval($uid), intval($uid),
intval($gid), intval($gid),
intval($member) dbesc($member)
); );
return $r; return $r;
@ -134,21 +135,21 @@ function group_add_member($uid,$name,$member,$gid = 0) {
if((! $gid) || (! $uid) || (! $member)) if((! $gid) || (! $uid) || (! $member))
return false; return false;
$r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `contact-id` = %d LIMIT 1", $r = q("SELECT * FROM `group_member` WHERE `uid` = %d AND `gid` = %d AND `xchan` = '%s' LIMIT 1",
intval($uid), intval($uid),
intval($gid), intval($gid),
intval($member) dbesc($member)
); );
if(count($r)) if(count($r))
return true; // You might question this, but return true; // You might question this, but
// we indicate success because the group member was in fact created // we indicate success because the group member was in fact created
// -- It was just created at another time // -- It was just created at another time
if(! count($r)) if(! count($r))
$r = q("INSERT INTO `group_member` (`uid`, `gid`, `contact-id`) $r = q("INSERT INTO `group_member` (`uid`, `gid`, `xchan`)
VALUES( %d, %d, %d ) ", VALUES( %d, %d, %d ) ",
intval($uid), intval($uid),
intval($gid), intval($gid),
intval($member) dbesc($member)
); );
return $r; return $r;
} }
@ -156,9 +157,9 @@ function group_add_member($uid,$name,$member,$gid = 0) {
function group_get_members($gid) { function group_get_members($gid) {
$ret = array(); $ret = array();
if(intval($gid)) { if(intval($gid)) {
$r = q("SELECT `group_member`.`contact-id`, `contact`.* FROM `group_member` $r = q("SELECT abook.*,xchan.* FROM `group_member`
LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id` 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 `contact`.`name` ASC ", WHERE `gid` = %d AND `group_member`.`uid` = %d ORDER BY xchan_name ASC ",
intval($gid), intval($gid),
intval(local_user()) intval(local_user())
); );
@ -168,24 +169,6 @@ function group_get_members($gid) {
return $ret; return $ret;
} }
function group_public_members($gid) {
$ret = 0;
if(intval($gid)) {
$r = q("SELECT `contact`.`id` AS `contact-id` FROM `group_member`
LEFT JOIN `contact` ON `contact`.`id` = `group_member`.`contact-id`
WHERE `gid` = %d AND `group_member`.`uid` = %d
AND `contact`.`network` = '%s' AND `contact`.`notify` != '' ",
intval($gid),
intval(local_user()),
dbesc(NETWORK_OSTATUS)
);
if(count($r))
$ret = count($r);
}
return $ret;
}
function mini_group_select($uid,$gid = 0) { function mini_group_select($uid,$gid = 0) {
$grps = array(); $grps = array();
@ -213,7 +196,7 @@ function mini_group_select($uid,$gid = 0) {
function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = 0) { function group_side($every="contacts",$each="group",$edit = false, $group_id = 0, $cid = '') {
$o = ''; $o = '';
@ -283,20 +266,22 @@ function expand_groups($a) {
if(! (is_array($a) && count($a))) if(! (is_array($a) && count($a)))
return array(); return array();
$groups = implode(',', $a); $groups = implode(',', $a);
$groups = dbesc($groups); $groups = dbesc($groups);
$r = q("SELECT `contact-id` FROM `group_member` WHERE `gid` IN ( $groups )"); stringify_array_elms($groups);
$r = q("SELECT xchan FROM `group_member` WHERE `gid` IN ( $groups )");
$ret = array(); $ret = array();
if(count($r)) if(count($r))
foreach($r as $rr) foreach($r as $rr)
$ret[] = $rr['contact-id']; $ret[] = $rr['xchan'];
return $ret; return $ret;
} }
function member_of($c) { function member_of($c) {
$r = q("SELECT `group`.`name`, `group`.`id` FROM `group` LEFT JOIN `group_member` ON `group_member`.`gid` = `group`.`id` WHERE `group_member`.`contact-id` = %d AND `group`.`deleted` = 0 ORDER BY `group`.`name` ASC ", $r = q("SELECT `group`.`name`, `group`.`id` FROM `group` LEFT JOIN `group_member` ON `group_member`.`gid` = `group`.`id` WHERE `group_member`.`xchan` = '%s' AND `group`.`deleted` = 0 ORDER BY `group`.`name` ASC ",
intval($c) dbesc($c)
); );
return $r; return $r;
@ -305,9 +290,9 @@ function member_of($c) {
function groups_containing($uid,$c) { function groups_containing($uid,$c) {
$r = q("SELECT `gid` FROM `group_member` WHERE `uid` = %d AND `group_member`.`contact-id` = %d ", $r = q("SELECT `gid` FROM `group_member` WHERE `uid` = %d AND `group_member`.`xchan` = '%s' ",
intval($uid), intval($uid),
intval($c) dbesc($c)
); );
$ret = array(); $ret = array();

12
include/text.php
View File

@ -310,16 +310,18 @@ function alt_pager(&$a, $i) {
if(! function_exists('expand_acl')) { if(! function_exists('expand_acl')) {
function expand_acl($s) { function expand_acl($s) {
// turn string array of angle-bracketed elements into numeric array
// e.g. "<1><2><3>" => array(1,2,3); // turn string array of angle-bracketed elements into string array
// e.g. "<123xyz><246qyo><sxo33e>" => array(123xyz,246qyo,sxo33e);
$ret = array(); $ret = array();
if(strlen($s)) { if(strlen($s)) {
$t = str_replace('<','',$s); $t = str_replace('<','',$s);
$a = explode('>',$t); $a = explode('>',$t);
foreach($a as $aa) { foreach($a as $aa) {
if(intval($aa)) if($aa)
$ret[] = intval($aa); $ret[] = $aa;
} }
} }
return $ret; return $ret;
@ -330,7 +332,7 @@ function expand_acl($s) {
if(! function_exists('sanitise_acl')) { if(! function_exists('sanitise_acl')) {
function sanitise_acl(&$item) { function sanitise_acl(&$item) {
if(intval($item)) if(intval($item))
$item = '<' . intval(notags(trim($item))) . '>'; $item = '<' . notags(trim($item)) . '>';
else else
unset($item); unset($item);
}} }}