Implement functions

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

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 535f6483e4e55c2bf9f26f9916dd6744fe03ee3d..a47d70ab38b2a60ebe037d0ec98594b33e268bcc 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -5,12 +5,14 @@
  */
 namespace Friendica\Content;
 
+use Friendica\Core\Protocol;
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
 use Friendica\Model\Contact;
+use Friendica\Util\Proxy as ProxyUtils;
 
 require_once 'include/dba.php';
 
@@ -36,25 +38,29 @@ class ForumManager
         */
        public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
        {
-               $forumlist = [];
+               if ($lastitem) {
+                       $params = ['order' => ['last-item' => true]];
+               } else {
+                       $params = ['order' => ['name']];
+               }
+
+               $condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` AND ";
 
-               $order = (($showhidden) ? '' : ' AND NOT `hidden` ');
-               $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC ');
-               $select = '`forum` ';
                if ($showprivate) {
-                       $select = '(`forum` OR `prv`)';
+                       $condition_str .= '(`forum` OR `prv`)';
+               } else {
+                       $condition_str .= '`forum`';
                }
 
-               $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 `pending` AND NOT `archive`
-                               AND `success_update` > `failure_update`
-                       $order ",
-                       $uid
-               );
+               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) {
                        return($forumlist);
                }
@@ -99,7 +105,7 @@ class ForumManager
                $total = count($contacts);
                $visible_forums = 10;
 
-               if (DBM::is_result($contacts)) {
+               if (DBA::isResult($contacts)) {
                        $id = 0;
 
                        foreach ($contacts as $contact) {
@@ -111,15 +117,15 @@ class ForumManager
                                        'name' => $contact['name'],
                                        'cid' => $contact['id'],
                                        'selected'      => $selected,
-                                       'micro' => System::removedBaseUrl(proxy_url($contact['micro'], false, PROXY_SIZE_MICRO)),
+                                       'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
                                        'id' => ++$id,
                                ];
                                $entries[] = $entry;
                        }
 
-                       $tpl = get_markup_template('widget_forumlist.tpl');
+                       $tpl = Renderer::getMarkupTemplate('widget_forumlist.tpl');
 
-                       $o .= replace_macros(
+                       $o .= Renderer::replaceMacros(
                                $tpl,
                                [
                                        '$title'        => L10n::t('Forums'),