X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=424f54e0cafe118786a0bdb1f93ab3c29da07b1a;hb=312c01a517369c0b3e1ef818081a780c0d445f93;hp=980e82522c38f154cc5ac424d8b73666026005f3;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 980e82522c..424f54e0ca 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -71,7 +71,7 @@ class ForumManager
 
 		$forumlist = [];
 
-		$fields = ['id', 'url', 'name', 'micro', 'thumb', 'avatar'];
+		$fields = ['id', 'url', 'name', 'micro', 'thumb', 'avatar', 'network', 'uid'];
 		$condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid];
 		$contacts = DBA::select('contact', $fields, $condition, $params);
 		if (!$contacts) {
@@ -99,13 +99,14 @@ class ForumManager
 	 * Sidebar widget to show subcribed friendica forums. If activated
 	 * in the settings, it appears at the notwork page sidebar
 	 *
-	 * @param int $uid The ID of the User
-	 * @param int $cid The contact id which is used to mark a forum as "selected"
+	 * @param string $baseurl Base module path
+	 * @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)
+	public static function widget(string $baseurl, int $uid, int $cid = 0)
 	{
 		$o = '';
 
@@ -125,8 +126,8 @@ class ForumManager
 				$selected = (($cid == $contact['id']) ? ' forum-selected' : '');
 
 				$entry = [
-					'url' => 'network?contactid=' . $contact['id'],
-					'external_url' => Contact::magicLink($contact['url']),
+					'url' => $baseurl . '/' . $contact['id'],
+					'external_url' => Contact::magicLinkByContact($contact),
 					'name' => $contact['name'],
 					'cid' => $contact['id'],
 					'selected' 	=> $selected,
@@ -146,6 +147,7 @@ class ForumManager
 					'$link_desc'	=> DI::l10n()->t('External link to forum'),
 					'$total'	=> $total,
 					'$visible_forums' => $visible_forums,
+					'$showless'	=> DI::l10n()->t('show less'),
 					'$showmore'	=> DI::l10n()->t('show more')]
 			);
 		}
@@ -207,14 +209,14 @@ class ForumManager
 	public static function countUnseenItems()
 	{
 		$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` = ? AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen`
-				AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`)
+			"SELECT `contact`.`id`, `contact`.`name`, COUNT(*) AS `count` FROM `post-view`
+				INNER JOIN `contact` ON `post-view`.`contact-id` = `contact`.`id`
+				WHERE `post-view`.`uid` = ? AND `post-view`.`visible` AND NOT `post-view`.`deleted` AND `post-view`.`unseen`
+				AND `contact`.`network` IN (?, ?) AND `contact`.`contact-type` = ?
 				AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
 				AND NOT `contact`.`pending` AND NOT `contact`.`archive`
-				GROUP BY `contact`.`id` ",
-			local_user()
+				GROUP BY `contact`.`id`",
+			local_user(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY
 		);
 
 		return DBA::toArray($stmtContacts);