X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=f3f3392ec189c907ef77be4cd3f8723c70dca2a7;hb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;hp=9ea8cc449ece517619d677a731a35d22e3d4d150;hpb=61d33bea664ec654e94cc37db3f0a0c594b19e22;p=friendica.git

diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php
index 9ea8cc449e..f3f3392ec1 100644
--- a/src/Content/ForumManager.php
+++ b/src/Content/ForumManager.php
@@ -1,26 +1,25 @@
 <?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;
 
 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 +42,7 @@ class ForumManager
 			$params = ['order' => ['name']];
 		}
 
-		$condition_str = "`network` = ? AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` 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 +57,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 +79,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
@@ -116,7 +115,7 @@ class ForumManager
 					'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;
@@ -127,12 +126,12 @@ class ForumManager
 			$o .= Renderer::replaceMacros(
 				$tpl,
 				[
-					'$title'	=> L10n::t('Forums'),
+					'$title'	=> DI::l10n()->t('Forums'),
 					'$forums'	=> $entries,
-					'$link_desc'	=> L10n::t('External link to forum'),
+					'$link_desc'	=> DI::l10n()->t('External link to forum'),
 					'$total'	=> $total,
 					'$visible_forums' => $visible_forums,
-					'$showmore'	=> L10n::t('show more')]
+					'$showmore'	=> DI::l10n()->t('show more')]
 			);
 		}
 
@@ -140,7 +139,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 +183,7 @@ class ForumManager
 	}
 
 	/**
-	 * @brief count unread forum items
+	 * count unread forum items
 	 *
 	 * Count unread items of connected forums and private groups
 	 *