Rename DBA::fetch_first to DBA::fetchFirst

[friendica.git] / src / Content / ForumManager.php

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 3d84b95a38e691e4299018eedd9ce9198c713c61..535f6483e4e55c2bf9f26f9916dd6744fe03ee3d 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -5,11 +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';
 
@@ -44,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
@@ -58,7 +59,7 @@ class ForumManager
                        return($forumlist);
                }
 
-               while ($contact = dba::fetch($contacts)) {
+               while ($contact = DBA::fetch($contacts)) {
                        $forumlist[] = [
                                'url'   => $contact['url'],
                                'name'  => $contact['name'],
@@ -67,7 +68,7 @@ class ForumManager
                                'thumb' => $contact['thumb'],
                        ];
                }
-               dba::close($contacts);
+               DBA::close($contacts);
 
                return($forumlist);
        }
@@ -106,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,
@@ -121,12 +122,12 @@ class ForumManager
                        $o .= replace_macros(
                                $tpl,
                                [
-                                       '$title'        => t('Forums'),
+                                       '$title'        => L10n::t('Forums'),
                                        '$forums'       => $entries,
-                                       '$link_desc'    => t('External link to forum'),
+                                       '$link_desc'    => L10n::t('External link to forum'),
                                        '$total'        => $total,
                                        '$visible_forums' => $visible_forums,
-                                       '$showmore'     => t('show more')]
+                                       '$showmore'     => L10n::t('show more')]
                        );
                }