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

some anomolies found when viewing connections in various cases.

Browse Source
This commit is contained in:
friendica
2014-03-02 19:40:59 -08:00
parent b98ddc69de
commit 7baeb45183
5 changed files with 78 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/text.php
View File

@@ -665,8 +665,11 @@ function contact_block() {
if((! is_array($a->profile)) || ($a->profile['hide_friends']))
return $o;
$r = q("SELECT COUNT(abook_id) AS total FROM abook WHERE abook_channel = %d and abook_flags = 0",
intval($a->profile['uid'])
$r = q("SELECT COUNT(abook_id) AS total FROM abook left join xchan on abook_xchan = xchan_hash WHERE abook_channel = %d and abook_flags = 0 and not (xchan_flags & %d) and not (xchan_flags & %d) and not (xchan_flags & %d)",
intval($a->profile['uid']),
intval(XCHAN_FLAGS_HIDDEN),
intval(XCHAN_FLAGS_ORPHAN),
intval(XCHAN_FLAGS_DELETED)
);
if(count($r)) {
$total = intval($r[0]['total']);
@@ -677,8 +680,11 @@ function contact_block() {
} else {
$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",
$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 and not (xchan_flags & %d ) and not (xchan_flags & %d ) and not (xchan_flags & %d ) ORDER BY RAND() LIMIT %d",
intval($a->profile['uid']),
intval(XCHAN_FLAGS_HIDDEN),
intval(XCHAN_FLAGS_ORPHAN),
intval(XCHAN_FLAGS_DELETED),
intval($shown)
);

21
include/zot.php
View File

@@ -330,8 +330,15 @@ function zot_refresh($them,$channel = null, $force = false) {
else
$permissions = $j['permissions'];
$connected_set = false;
if($permissions && is_array($permissions)) {
foreach($permissions as $k => $v) {
// The connected permission means you are in their address book
if($k === 'connected') {
$connected_set = intval($v);
continue;
}
if($v) {
$their_perms = $their_perms | intval($global_perms[$k][1]);
}
@@ -353,6 +360,20 @@ function zot_refresh($them,$channel = null, $force = false) {
intval($channel['channel_id']),
intval(ABOOK_FLAG_SELF)
);
if($connected_set === 0) {
// if they are in your address book but you aren't in theirs, mark their address book entry hidden.
$y1 = q("update abook set abook_flags = (abook_flags | %d)
where abook_xchan = '%s' and abook_channel = %d
and not (abook_flags & %d) limit 1",
intval(ABOOK_FLAG_HIDDEN),
dbesc($x['hash']),
intval($channel['channel_id']),
intval(ABOOK_FLAG_SELF)
);
}
if(! $y)
logger('abook update failed');
else {