X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=535f6483e4e55c2bf9f26f9916dd6744fe03ee3d;hb=f051ae169868905d3f3debbed37c8cf0f8b2be35;hp=4f09b8a1126a3cc0512f763d9ffc307a9a977be5;hpb=30c1cc0e8cec5438fd8fe36bd4ea00991dc01934;p=friendica.git diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php index 4f09b8a112..535f6483e4 100644 --- a/src/Content/ForumManager.php +++ b/src/Content/ForumManager.php @@ -5,12 +5,12 @@ */ namespace Friendica\Content; -use Friendica\App; use Friendica\Content\Feature; use Friendica\Core\L10n; use Friendica\Core\System; +use Friendica\Database\DBA; use Friendica\Database\DBM; -use dba; +use Friendica\Model\Contact; require_once 'include/dba.php'; @@ -45,11 +45,11 @@ class ForumManager $select = '(`forum` OR `prv`)'; } - $contacts = dba::p( + $contacts = DBA::p( "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 `hidden` AND NOT `pending` AND NOT `archive` + AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` $order ", $uid @@ -59,7 +59,7 @@ class ForumManager return($forumlist); } - while ($contact = dba::fetch($contacts)) { + while ($contact = DBA::fetch($contacts)) { $forumlist[] = [ 'url' => $contact['url'], 'name' => $contact['name'], @@ -68,7 +68,7 @@ class ForumManager 'thumb' => $contact['thumb'], ]; } - dba::close($contacts); + DBA::close($contacts); return($forumlist); } @@ -107,7 +107,7 @@ class ForumManager $entry = [ 'url' => 'network?f=&cid=' . $contact['id'], - 'external_url' => 'redir/' . $contact['id'], + 'external_url' => Contact::magicLink($contact['url']), 'name' => $contact['name'], 'cid' => $contact['id'], 'selected' => $selected,