Merge pull request #7487 from MrPetovan/task/7473-trending-tags

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

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index a47d70ab38b2a60ebe037d0ec98594b33e268bcc..9ea8cc449ece517619d677a731a35d22e3d4d150 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -6,7 +6,7 @@
 namespace Friendica\Content;
 
 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;
@@ -14,8 +14,6 @@ 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
  */
@@ -30,11 +28,12 @@ class ForumManager
         * @param boolean $showprivate Show private groups
         *
         * @return array
-        *      'url'   => forum url
-        *      'name'  => forum name
-        *      'id'    => number of the key from the array
-        *      'micro' => contact photo in format micro
-        *      'thumb' => contact photo in format thumb
+        *    'url'    => forum url
+        *    'name'    => forum name
+        *    'id'    => number of the key from the array
+        *    'micro' => contact photo in format micro
+        *    'thumb' => contact photo in format thumb
+        * @throws \Exception
         */
        public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false)
        {
@@ -44,7 +43,7 @@ class ForumManager
                        $params = ['order' => ['name']];
                }
 
-               $condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND `success_update` > `failure_update` AND ";
+               $condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND ";
 
                if ($showprivate) {
                        $condition_str .= '(`forum` OR `prv`)';
@@ -89,13 +88,11 @@ class ForumManager
         * @param int $uid The ID of the User
         * @param int $cid The contact id which is used to mark a forum as "selected"
         * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function widget($uid, $cid = 0)
        {
-               if (! intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) {
-                       return;
-               }
-
                $o = '';
 
                //sort by last updated item
@@ -108,11 +105,13 @@ class ForumManager
                if (DBA::isResult($contacts)) {
                        $id = 0;
 
+                       $entries = [];
+
                        foreach ($contacts as $contact) {
                                $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
                                $entry = [
-                                       'url' => 'network?f=&cid=' . $contact['id'],
+                                       'url' => 'network?cid=' . $contact['id'],
                                        'external_url' => Contact::magicLink($contact['url']),
                                        'name' => $contact['name'],
                                        'cid' => $contact['id'],
@@ -148,6 +147,8 @@ class ForumManager
         *
         * @param int $uid The ID of the User
         * @return string
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+        * @throws \ImagickException
         */
        public static function profileAdvanced($uid)
        {
@@ -169,7 +170,7 @@ class ForumManager
                $total_shown = 0;
                $forumlist = '';
                foreach ($contacts as $contact) {
-                       $forumlist .= micropro($contact, false, 'forumlist-profile-advanced');
+                       $forumlist .= HTML::micropro($contact, true, 'forumlist-profile-advanced');
                        $total_shown ++;
                        if ($total_shown == $show_total) {
                                break;
@@ -188,24 +189,24 @@ class ForumManager
         * Count unread items of connected forums and private groups
         *
         * @return array
-        *      'id' => contact id
-        *      'name' => contact/forum name
-        *      'count' => counted unseen forum items
+        *    'id' => contact id
+        *    'name' => contact/forum name
+        *    'count' => counted unseen forum items
+        * @throws \Exception
         */
        public static function countUnseenItems()
        {
-               $r = q(
+               $stmtContacts = DBA::p(
                        "SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `item`
                                INNER JOIN `contact` ON `item`.`contact-id` = `contact`.`id`
-                               WHERE `item`.`uid` = %d AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
+                               WHERE `item`.`uid` = ? AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
                                AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`)
                                AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
                                AND NOT `contact`.`pending` AND NOT `contact`.`archive`
-                               AND `contact`.`success_update` > `failure_update`
                                GROUP BY `contact`.`id` ",
-                       intval(local_user())
+                       local_user()
                );
 
-               return $r;
+               return DBA::toArray($stmtContacts);
        }
 }