+ $sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`blocked`)", intval(local_user()));
+ $select_uid = 0;
break;
case 'hidden':
break;
case 'hidden':
- $sql_extra = " AND `hidden` AND NOT `blocked`";
+ $sql_extra = " AND `hidden` AND NOT `blocked` AND NOT `pending`";
break;
case 'ignored':
break;
case 'ignored':
- $sql_extra = " AND `readonly` AND NOT `blocked`";
+ $sql_extra = sprintf(" AND EXISTS(SELECT `id` from `user-contact` WHERE `contact`.`id` = `user-contact`.`cid` and `user-contact`.`uid` = %d and `user-contact`.`ignored`)", intval(local_user()));
+ $select_uid = 0;
break;
case 'archived':
break;
case 'archived':
- $sql_extra = " AND `archive` AND NOT `blocked`";
+ $sql_extra = " AND `archive` AND NOT `blocked` AND NOT `pending`";
+ break;
+ case 'pending':
+ $sql_extra = sprintf(" AND `pending` AND NOT `archive` AND ((`rel` = %d)
+ OR EXISTS (SELECT `id` FROM `intro` WHERE `contact-id` = `contact`.`id` AND NOT `ignore`))", Model\Contact::SHARING);
break;
default:
break;
default:
- $sql_extra = " AND NOT `archive` AND NOT `blocked`";
+ $sql_extra = " AND NOT `archive` AND NOT `blocked` AND NOT `pending`";
}
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);
}
$sql_extra .= sprintf(" AND `network` != '%s' ", Protocol::PHANTOM);