Merge pull request #6324 from MrPetovan/bug/6316-remove-html-encode

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

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index e5d153f75960c5988ae34816ddd0c49689450fc8..7b947359a6521a246b1ebcba64e3f35f4ffb0f9d 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -5,10 +5,17 @@
  */
 namespace Friendica\Content;
 
-use Friendica\App;
+use Friendica\Core\Protocol;
+use Friendica\Content\Feature;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\L10n;
+use Friendica\Core\Renderer;
 use Friendica\Core\System;
-use Friendica\Database\DBM;
-use dba;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
+use Friendica\Util\Proxy as ProxyUtils;
+
+require_once 'include/dba.php';
 
 /**
  * @brief This class handles methods related to the forum functionality
@@ -32,39 +39,43 @@ class ForumManager
         */
        public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
        {
-               $forumlist = array();
+               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 `hidden` 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);
                }
 
-               while ($contact = dba::fetch($contacts)) {
-                       $forumlist[] = array(
+               while ($contact = DBA::fetch($contacts)) {
+                       $forumlist[] = [
                                'url'   => $contact['url'],
                                'name'  => $contact['name'],
                                'id'    => $contact['id'],
                                'micro' => $contact['micro'],
                                'thumb' => $contact['thumb'],
-                       );
+                       ];
                }
-               dba::close($contacts);
+               DBA::close($contacts);
 
                return($forumlist);
        }
@@ -82,10 +93,6 @@ class ForumManager
         */
        public static function widget($uid, $cid = 0)
        {
-               if (! intval(feature_enabled(local_user(), 'forumlist_widget'))) {
-                       return;
-               }
-
                $o = '';
 
                //sort by last updated item
@@ -95,35 +102,35 @@ class ForumManager
                $total = count($contacts);
                $visible_forums = 10;
 
-               if (DBM::is_result($contacts)) {
+               if (DBA::isResult($contacts)) {
                        $id = 0;
 
                        foreach ($contacts as $contact) {
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
-                               $entry = array(
+                               $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,
-                                       '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,
-                               array(
-                                       '$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')]
                        );
                }
 
@@ -141,7 +148,7 @@ class ForumManager
         */
        public static function profileAdvanced($uid)
        {
-               $profile = intval(feature_enabled($uid, 'forumlist_profile'));
+               $profile = intval(Feature::isEnabled($uid, 'forumlist_profile'));
                if (! $profile) {
                        return;
                }
@@ -157,9 +164,9 @@ class ForumManager
                $contacts = self::getList($uid, $lastitem, false, false);
 
                $total_shown = 0;
-
+               $forumlist = '';
                foreach ($contacts as $contact) {
-                       $forumlist .= micropro($contact, false, 'forumlist-profile-advanced');
+                       $forumlist .= HTML::micropro($contact, false, 'forumlist-profile-advanced');
                        $total_shown ++;
                        if ($total_shown == $show_total) {
                                break;