X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=0104d388f59f9b557900d0919face9e4dbcb7c7a;hb=8034a48ffe6deef939172c8e659cbd3e0d497464;hp=9ea8cc449ece517619d677a731a35d22e3d4d150;hpb=6df53624c73364af4b1cb2de1132d4af443d4af3;p=friendica.git diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php index 9ea8cc449e..0104d388f5 100644 --- a/src/Content/ForumManager.php +++ b/src/Content/ForumManager.php @@ -1,26 +1,40 @@ . + * */ + namespace Friendica\Content; -use Friendica\Core\Protocol; use Friendica\Content\Text\HTML; -use Friendica\Core\L10n; +use Friendica\Core\Protocol; 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 +57,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`)'; @@ -57,8 +71,8 @@ class ForumManager $forumlist = []; - $fields = ['id', 'url', 'name', 'micro', 'thumb']; - $condition = [$condition_str, Protocol::DFRN, $uid]; + $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) { return($forumlist); @@ -80,18 +94,19 @@ 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 * - * @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 = ''; @@ -111,12 +126,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' => System::removedBaseUrl(ProxyUtils::proxifyUrl($contact['micro'], false, ProxyUtils::SIZE_MICRO)), + 'micro' => DI::baseUrl()->remove(Contact::getMicro($contact)), 'id' => ++$id, ]; $entries[] = $entry; @@ -127,12 +142,13 @@ 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')] + '$showless' => DI::l10n()->t('show less'), + '$showmore' => DI::l10n()->t('show more')] ); } @@ -140,7 +156,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. @@ -153,8 +169,8 @@ class ForumManager public static function profileAdvanced($uid) { $profile = intval(Feature::isEnabled($uid, 'forumlist_profile')); - if (! $profile) { - return; + if (!$profile) { + return ''; } $o = ''; @@ -168,23 +184,19 @@ 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; } /** - * @brief count unread forum items + * count unread forum items * * Count unread items of connected forums and private groups * @@ -197,14 +209,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`", + local_user(), Protocol::DFRN, Protocol::ACTIVITYPUB, Contact::TYPE_COMMUNITY, local_user() ); return DBA::toArray($stmtContacts);