keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5664 from annando/issue-4726

Browse source 
Isse 4726: Fixes the condition for showing hidden contacts
This commit is contained in:
Tobias Diekershoff 2018-08-25 19:55:36 +02:00 committed by GitHub
commit 39c7fe6d45
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Content/ForumManager.php
View file

@ -5,6 +5,7 @@
*/ */
namespace Friendica\Content; namespace Friendica\Content;
use Friendica\Core\Protocol;
use Friendica\Content\Feature; use Friendica\Content\Feature;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
@ -36,25 +37,29 @@ class ForumManager
*/ */
public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false) public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
{ {
$forumlist = []; if ($lastitem) {
$params = ['order' => ['last-item' => true]];
$order = (($showhidden) ? '' : ' AND NOT `hidden` '); } else {
$order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC '); $params = ['order' => ['name']];
$select = '`forum` ';
if ($showprivate) {
$select = '(`forum` OR `prv`)';
} }
$contacts = DBA::p( $condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` AND ";
"SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro`, `contact`.`thumb`
FROM `contact`
WHERE `network`= 'dfrn' AND $select AND `uid` = ?
AND NOT `blocked` AND NOT `pending` AND NOT `archive`
AND `success_update` > `failure_update`
$order ",
$uid
);
if ($showprivate) {
$condition_str .= '(`forum` OR `prv`)';
} else {
$condition_str .= '`forum`';
}
if (!$showhidden) {
$condition_str .= ' AND NOT `hidden`';
}
$forumlist = [];
$fields = ['id', 'url', 'name', 'micro', 'thumb'];
$condition = [$condition_str, Protocol::DFRN, $uid];
$contacts = DBA::select('contact', $fields, $condition, $params);
if (!$contacts) { if (!$contacts) {
return($forumlist); return($forumlist);
} }