X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=5decaac141454fac2f69c1e653913f79e271e860;hb=7b02585b978f7aef9d5c5a2c5d2b238cb674a4b7;hp=f3f3392ec189c907ef77be4cd3f8723c70dca2a7;hpb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;p=friendica.git diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php index f3f3392ec1..5decaac141 100644 --- a/src/Content/ForumManager.php +++ b/src/Content/ForumManager.php @@ -1,17 +1,32 @@ . + * */ + namespace Friendica\Content; -use Friendica\Core\Protocol; use Friendica\Content\Text\HTML; +use Friendica\Core\Protocol; use Friendica\Core\Renderer; use Friendica\Database\DBA; use Friendica\DI; use Friendica\Model\Contact; -use Friendica\Util\Proxy as ProxyUtils; /** * This class handles methods related to the forum functionality @@ -23,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 @@ -42,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']; - $condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid]; - $contacts = DBA::select('contact', $fields, $condition, $params); + $fields = ['id', 'url', 'name', 'micro', 'thumb', 'avatar', 'network', 'uid']; + $contacts = DBA::select('account-user-view', $fields, $condition, $params); if (!$contacts) { return($forumlist); } @@ -81,16 +102,17 @@ 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 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 = ''; @@ -110,12 +132,12 @@ class ForumManager $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); $entry = [ - 'url' => 'network?cid=' . $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, - 'micro' => DI::baseUrl()->remove(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)), + 'micro' => DI::baseUrl()->remove(Contact::getMicro($contact)), 'id' => ++$id, ]; $entries[] = $entry; @@ -131,6 +153,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')] ); } @@ -152,8 +175,8 @@ class ForumManager public static function profileAdvanced($uid) { $profile = intval(Feature::isEnabled($uid, 'forumlist_profile')); - if (! $profile) { - return; + if (!$profile) { + return ''; } $o = ''; @@ -167,19 +190,15 @@ class ForumManager $contacts = self::getList($uid, $lastitem, false, false); $total_shown = 0; - $forumlist = ''; foreach ($contacts as $contact) { - $forumlist .= HTML::micropro($contact, true, 'forumlist-profile-advanced'); - $total_shown ++; + $o .= HTML::micropro($contact, true, 'forumlist-profile-advanced'); + $total_shown++; if ($total_shown == $show_total) { break; } } - if (count($contacts) > 0) { - $o .= $forumlist; - return $o; - } + return $o; } /** @@ -196,14 +215,15 @@ 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-user-view` + INNER JOIN `contact` ON `post-user-view`.`contact-id` = `contact`.`id` + WHERE `post-user-view`.`uid` = ? AND `post-user-view`.`visible` AND NOT `post-user-view`.`deleted` AND `post-user-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() + AND `contact`.`uid` = ? + GROUP BY `contact`.`id`", + DI::userSession()->getLocalUserId(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY, DI::userSession()->getLocalUserId() ); return DBA::toArray($stmtContacts);