X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=src%2FContent%2FForumManager.php;h=5decaac141454fac2f69c1e653913f79e271e860;hb=7b02585b978f7aef9d5c5a2c5d2b238cb674a4b7;hp=8556ba35303dd8591a6123b70233b770bc166fb8;hpb=054c301ef0345c4ff9f35cfd08717757eab17b9d;p=friendica.git

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 8556ba3530..5decaac141 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -38,7 +38,7 @@ class ForumManager
 	 *
 	 * @param int     $uid         of the profile owner
 	 * @param boolean $lastitem    Sort by lastitem
-	 * @param boolean $showhidden  Show frorums which are not hidden
+	 * @param boolean $showhidden  Show forums which are not hidden
 	 * @param boolean $showprivate Show private groups
 	 *
 	 * @return array
@@ -57,23 +57,29 @@ class ForumManager
 			$params = ['order' => ['name']];
 		}
 
-		$condition_str = "`network` IN (?, ?) AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND ";
+		$condition = [
+			'contact-type' => Contact::TYPE_COMMUNITY,
+			'network' => [Protocol::DFRN, Protocol::ACTIVITYPUB],
+			'uid' => $uid,
+			'blocked' => false,
+			'pending' => false,
+			'archive' => false,
+		];
 
-		if ($showprivate) {
-			$condition_str .= '(`forum` OR `prv`)';
-		} else {
-			$condition_str .= '`forum`';
+		$condition = DBA::mergeConditions($condition, ["`platform` != ?", 'peertube']);
+
+		if (!$showprivate) {
+			$condition = DBA::mergeConditions($condition, ['manually-approve' => false]);
 		}
 
 		if (!$showhidden) {
-			$condition_str .=  ' AND NOT `hidden`';
+			$condition = DBA::mergeConditions($condition, ['hidden' => false]);
 		}
 
 		$forumlist = [];
 
 		$fields = ['id', 'url', 'name', 'micro', 'thumb', 'avatar', 'network', 'uid'];
-		$condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid];
-		$contacts = DBA::select('contact', $fields, $condition, $params);
+		$contacts = DBA::select('account-user-view', $fields, $condition, $params);
 		if (!$contacts) {
 			return($forumlist);
 		}
@@ -96,7 +102,7 @@ class ForumManager
 	/**
 	 * Forumlist widget
 	 *
-	 * Sidebar widget to show subcribed friendica forums. If activated
+	 * Sidebar widget to show subscribed friendica forums. If activated
 	 * in the settings, it appears at the notwork page sidebar
 	 *
 	 * @param string $baseurl Base module path
@@ -215,8 +221,9 @@ class ForumManager
 				AND `contact`.`network` IN (?, ?) AND `contact`.`contact-type` = ?
 				AND NOT `contact`.`blocked` AND NOT `contact`.`hidden`
 				AND NOT `contact`.`pending` AND NOT `contact`.`archive`
+				AND `contact`.`uid` = ?
 				GROUP BY `contact`.`id`",
-			local_user(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY
+			DI::userSession()->getLocalUserId(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY, DI::userSession()->getLocalUserId()
 		);
 
 		return DBA::toArray($stmtContacts);