Merge pull request #3156 from rabuzarus/20170210_-_fix_pending_contacts_in_viewcontacts
Bugfix: pending contacts shouldn't be available in contacts widget and viewcontacts
This commit is contained in:
commit
27fe4ae2a4
4 changed files with 14 additions and 8 deletions
|
@ -626,7 +626,7 @@ use \Friendica\Core\Config;
|
||||||
// count friends
|
// count friends
|
||||||
$r = q("SELECT count(*) as `count` FROM `contact`
|
$r = q("SELECT count(*) as `count` FROM `contact`
|
||||||
WHERE `uid` = %d AND `rel` IN ( %d, %d )
|
WHERE `uid` = %d AND `rel` IN ( %d, %d )
|
||||||
AND `self`=0 AND NOT `blocked` AND `hidden`=0",
|
AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0",
|
||||||
intval($uinfo[0]['uid']),
|
intval($uinfo[0]['uid']),
|
||||||
intval(CONTACT_IS_SHARING),
|
intval(CONTACT_IS_SHARING),
|
||||||
intval(CONTACT_IS_FRIEND)
|
intval(CONTACT_IS_FRIEND)
|
||||||
|
@ -635,7 +635,7 @@ use \Friendica\Core\Config;
|
||||||
|
|
||||||
$r = q("SELECT count(*) as `count` FROM `contact`
|
$r = q("SELECT count(*) as `count` FROM `contact`
|
||||||
WHERE `uid` = %d AND `rel` IN ( %d, %d )
|
WHERE `uid` = %d AND `rel` IN ( %d, %d )
|
||||||
AND `self`=0 AND NOT `blocked` AND `hidden`=0",
|
AND `self`=0 AND NOT `blocked` AND NOT `pending` AND `hidden`=0",
|
||||||
intval($uinfo[0]['uid']),
|
intval($uinfo[0]['uid']),
|
||||||
intval(CONTACT_IS_FOLLOWER),
|
intval(CONTACT_IS_FOLLOWER),
|
||||||
intval(CONTACT_IS_FRIEND)
|
intval(CONTACT_IS_FRIEND)
|
||||||
|
|
|
@ -374,7 +374,10 @@ function profile_sidebar($profile, $block = 0) {
|
||||||
if (dbm::is_result($r))
|
if (dbm::is_result($r))
|
||||||
$updated = date("c", strtotime($r[0]['updated']));
|
$updated = date("c", strtotime($r[0]['updated']));
|
||||||
|
|
||||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND NOT `self` AND NOT `blocked` AND NOT `hidden` AND NOT `archive`
|
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||||
|
WHERE `uid` = %d
|
||||||
|
AND NOT `self` AND NOT `blocked` AND NOT `pending`
|
||||||
|
AND NOT `hidden` AND NOT `archive`
|
||||||
AND `network` IN ('%s', '%s', '%s', '')",
|
AND `network` IN ('%s', '%s', '%s', '')",
|
||||||
intval($profile['uid']),
|
intval($profile['uid']),
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
|
|
|
@ -875,7 +875,7 @@ function contact_block() {
|
||||||
return $o;
|
return $o;
|
||||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||||
WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
|
WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
|
||||||
AND NOT `hidden` AND NOT `archive`
|
AND NOT `pending` AND NOT `hidden` AND NOT `archive`
|
||||||
AND `network` IN ('%s', '%s', '%s')",
|
AND `network` IN ('%s', '%s', '%s')",
|
||||||
intval($a->profile['uid']),
|
intval($a->profile['uid']),
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
|
@ -893,8 +893,9 @@ function contact_block() {
|
||||||
// Splitting the query in two parts makes it much faster
|
// Splitting the query in two parts makes it much faster
|
||||||
$r = q("SELECT `id` FROM `contact`
|
$r = q("SELECT `id` FROM `contact`
|
||||||
WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
|
WHERE `uid` = %d AND NOT `self` AND NOT `blocked`
|
||||||
AND NOT `hidden` AND NOT `archive`
|
AND NOT `pending` AND NOT `hidden` AND NOT `archive`
|
||||||
AND `network` IN ('%s', '%s', '%s') ORDER BY RAND() LIMIT %d",
|
AND `network` IN ('%s', '%s', '%s')
|
||||||
|
ORDER BY RAND() LIMIT %d",
|
||||||
intval($a->profile['uid']),
|
intval($a->profile['uid']),
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
dbesc(NETWORK_OSTATUS),
|
dbesc(NETWORK_OSTATUS),
|
||||||
|
|
|
@ -48,7 +48,8 @@ function viewcontacts_content(App $a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
|
||||||
WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive`
|
WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
|
||||||
|
AND NOT `hidden` AND NOT `archive`
|
||||||
AND `network` IN ('%s', '%s', '%s')",
|
AND `network` IN ('%s', '%s', '%s')",
|
||||||
intval($a->profile['uid']),
|
intval($a->profile['uid']),
|
||||||
dbesc(NETWORK_DFRN),
|
dbesc(NETWORK_DFRN),
|
||||||
|
@ -59,7 +60,8 @@ function viewcontacts_content(App $a) {
|
||||||
$a->set_pager_total($r[0]['total']);
|
$a->set_pager_total($r[0]['total']);
|
||||||
|
|
||||||
$r = q("SELECT * FROM `contact`
|
$r = q("SELECT * FROM `contact`
|
||||||
WHERE `uid` = %d AND (NOT `blocked` OR `pending`) AND NOT `hidden` AND NOT `archive`
|
WHERE `uid` = %d AND NOT `blocked` AND NOT `pending`
|
||||||
|
AND NOT `hidden` AND NOT `archive`
|
||||||
AND `network` IN ('%s', '%s', '%s')
|
AND `network` IN ('%s', '%s', '%s')
|
||||||
ORDER BY `name` ASC LIMIT %d, %d",
|
ORDER BY `name` ASC LIMIT %d, %d",
|
||||||
intval($a->profile['uid']),
|
intval($a->profile['uid']),
|
||||||
|
|
Loading…
Reference in a new issue