diff options
| author | friendica <info@friendica.com> | 2012-11-29 23:06:03 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-11-29 23:06:03 -0800 |
| commit | f7ff2de1321ede230555b1c717a70608246afc85 (patch) | |
| tree | 31c37e275850e3951cc17557eaf7921240604a68 /mod | |
| parent | c079133719f7f495a7bbc639577e1f6b3292b765 (diff) | |
| download | volse-hubzilla-f7ff2de1321ede230555b1c717a70608246afc85.tar.gz volse-hubzilla-f7ff2de1321ede230555b1c717a70608246afc85.tar.bz2 volse-hubzilla-f7ff2de1321ede230555b1c717a70608246afc85.zip | |
add pending check on group queries
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/connections.php | 13 | ||||
| -rw-r--r-- | mod/group.php | 10 |
2 files changed, 14 insertions, 9 deletions
diff --git a/mod/connections.php b/mod/connections.php index 6a2076773..e365fe35f 100644 --- a/mod/connections.php +++ b/mod/connections.php @@ -219,10 +219,11 @@ EOT; $cmd = argv(2); $orig_record = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook_xchan = xchan_hash - WHERE abook_id = %d AND abook_channel = %d AND NOT ( abook_flags & %d ) LIMIT 1", + WHERE abook_id = %d AND abook_channel = %d AND NOT ( abook_flags & %d ) and not abook_flags & %d) LIMIT 1", intval($contact_id), intval(local_user()), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) ); if(! count($orig_record)) { @@ -562,9 +563,10 @@ EOT; $sql_extra .= sprintf(" AND xchan_network = '%s' ", dbesc($nets)); $r = q("SELECT COUNT(abook.abook_id) AS total FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash - where abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ", + where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) $sql_extra $sql_extra2 ", intval(local_user()), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) ); if(count($r)) { $a->set_pager_total($r[0]['total']); @@ -572,9 +574,10 @@ EOT; } dbg(1); $r = q("SELECT abook.*, xchan.* FROM abook left join xchan on abook.abook_xchan = xchan.xchan_hash - WHERE abook_channel = %d and not (abook_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", + WHERE abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d) $sql_extra $sql_extra2 ORDER BY xchan_name LIMIT %d , %d ", intval(local_user()), intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING), intval($a->pager['start']), intval($a->pager['itemspage']) ); diff --git a/mod/group.php b/mod/group.php index ae56da525..40f7d756a 100644 --- a/mod/group.php +++ b/mod/group.php @@ -114,11 +114,12 @@ function group_content(&$a) { if((argc() > 2) && intval(argv(1)) && argv(2)) { check_form_security_token_ForbiddenOnErr('group_member_change', 't'); - $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", + $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) and not (abook_flags & %d) limit 1", dbesc(argv(2)), intval(local_user()), intval(ABOOK_FLAG_SELF), - intval(ABOOK_FLAG_BLOCKED) + intval(ABOOK_FLAG_BLOCKED), + intval(ABOOK_FLAG_PENDING) ); if(count($r)) $change = argv(2); @@ -203,10 +204,11 @@ function group_content(&$a) { group_rmv_member(local_user(),$group['name'],$member['xchan_hash']); } - $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", + $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) and not (abook_flags & %d) order by xchan_name asc", intval(local_user()), intval(ABOOK_FLAG_BLOCKED), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) ); if(count($r)) { |