Merge pull request #8139 from MrPetovan/bug/notices

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

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index e9dab41ef9a26da1454993918b88f63a54d22a1a..0c34cb94d498291e587f17bff8f4a0f40d2c760b 100644 (file)
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @file src/Content/ForumManager.php
- * @brief ForumManager class with its methods related to forum functionality
+ * ForumManager class with its methods related to forum functionality
  */
 namespace Friendica\Content;
 
@@ -9,18 +9,18 @@ use Friendica\Core\Protocol;
 use Friendica\Content\Text\HTML;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Util\Proxy as ProxyUtils;
 
 /**
- * @brief This class handles methods related to the forum functionality
+ * This class handles methods related to the forum functionality
  */
 class ForumManager
 {
        /**
-        * @brief Function to list all forums a user is connected with
+        * Function to list all forums a user is connected with
         *
         * @param int     $uid         of the profile owner
         * @param boolean $lastitem    Sort by lastitem
@@ -43,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` IN (?, ?) AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND ";
 
                if ($showprivate) {
                        $condition_str .= '(`forum` OR `prv`)';
@@ -58,7 +58,7 @@ class ForumManager
                $forumlist = [];
 
                $fields = ['id', 'url', 'name', 'micro', 'thumb'];
-               $condition = [$condition_str, Protocol::DFRN, $uid];
+               $condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid];
                $contacts = DBA::select('contact', $fields, $condition, $params);
                if (!$contacts) {
                        return($forumlist);
@@ -80,7 +80,7 @@ class ForumManager
 
 
        /**
-        * @brief Forumlist widget
+        * Forumlist widget
         *
         * Sidebar widget to show subcribed friendica forums. If activated
         * in the settings, it appears at the notwork page sidebar
@@ -111,12 +111,12 @@ class ForumManager
                                $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'],
                                        'selected'      => $selected,
-                                       'micro' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
+                                       'micro' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)),
                                        'id' => ++$id,
                                ];
                                $entries[] = $entry;
@@ -140,7 +140,7 @@ class ForumManager
        }
 
        /**
-        * @brief Format forumlist as contact block
+        * Format forumlist as contact block
         *
         * This function is used to show the forumlist in
         * the advanced profile.
@@ -184,7 +184,7 @@ class ForumManager
        }
 
        /**
-        * @brief count unread forum items
+        * count unread forum items
         *
         * Count unread items of connected forums and private groups
         *
@@ -199,13 +199,12 @@ class ForumManager
                $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 DBA::toArray($stmtContacts);