X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FContent%2FForumManager.php;h=f3f3392ec189c907ef77be4cd3f8723c70dca2a7;hb=1bc4b2e0788ac11d3b377013b410f2250fff68aa;hp=0e6b39e4d043bbe788d32ac59c0a761285538b10;hpb=4d39164c1ee6de2b1a09c2a1a8a4c89531d47ee5;p=friendica.git diff --git a/src/Content/ForumManager.php b/src/Content/ForumManager.php index 0e6b39e4d0..f3f3392ec1 100644 --- a/src/Content/ForumManager.php +++ b/src/Content/ForumManager.php @@ -1,26 +1,25 @@ forum url - * 'name' => forum name - * 'id' => number of the key from the array - * 'micro' => contact photo in format micro - * 'thumb' => contact photo in format thumb + * 'url' => forum url + * 'name' => forum name + * 'id' => number of the key from the array + * 'micro' => contact photo in format micro + * 'thumb' => contact photo in format thumb + * @throws \Exception */ public static function getList($uid, $lastitem, $showhidden = true, $showprivate = false) { - $forumlist = []; + if ($lastitem) { + $params = ['order' => ['last-item' => true]]; + } else { + $params = ['order' => ['name']]; + } + + $condition_str = "`network` IN (?, ?) AND `uid` = ? AND NOT `blocked` AND NOT `pending` AND NOT `archive` AND "; - $order = (($showhidden) ? '' : ' AND NOT `hidden` '); - $order .= (($lastitem) ? ' ORDER BY `last-item` DESC ' : ' ORDER BY `name` ASC '); - $select = '`forum` '; if ($showprivate) { - $select = '(`forum` OR `prv`)'; + $condition_str .= '(`forum` OR `prv`)'; + } else { + $condition_str .= '`forum`'; } - $contacts = DBA::p( - "SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro`, `contact`.`thumb` - FROM `contact` - WHERE `network`= 'dfrn' AND $select AND `uid` = ? - AND NOT `blocked` AND NOT `pending` AND NOT `archive` - AND `success_update` > `failure_update` - $order ", - $uid - ); + if (!$showhidden) { + $condition_str .= ' AND NOT `hidden`'; + } + $forumlist = []; + + $fields = ['id', 'url', 'name', 'micro', 'thumb']; + $condition = [$condition_str, Protocol::DFRN, Protocol::ACTIVITYPUB, $uid]; + $contacts = DBA::select('contact', $fields, $condition, $params); if (!$contacts) { return($forumlist); } @@ -75,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 @@ -83,13 +87,11 @@ class ForumManager * @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) { - if (! intval(Feature::isEnabled(local_user(), 'forumlist_widget'))) { - return; - } - $o = ''; //sort by last updated item @@ -102,32 +104,34 @@ class ForumManager if (DBA::isResult($contacts)) { $id = 0; + $entries = []; + foreach ($contacts as $contact) { $selected = (($cid == $contact['id']) ? ' forum-selected' : ''); $entry = [ - 'url' => 'network?f=&cid=' . $contact['id'], + 'url' => 'network?cid=' . $contact['id'], 'external_url' => Contact::magicLink($contact['url']), '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; } - $tpl = get_markup_template('widget_forumlist.tpl'); + $tpl = Renderer::getMarkupTemplate('widget_forumlist.tpl'); - $o .= replace_macros( + $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')] ); } @@ -135,13 +139,15 @@ 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. * * @param int $uid The ID of the User * @return string + * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws \ImagickException */ public static function profileAdvanced($uid) { @@ -163,7 +169,7 @@ class ForumManager $total_shown = 0; $forumlist = ''; foreach ($contacts as $contact) { - $forumlist .= micropro($contact, false, 'forumlist-profile-advanced'); + $forumlist .= HTML::micropro($contact, true, 'forumlist-profile-advanced'); $total_shown ++; if ($total_shown == $show_total) { break; @@ -177,29 +183,29 @@ class ForumManager } /** - * @brief count unread forum items + * count unread forum items * * Count unread items of connected forums and private groups * * @return array - * 'id' => contact id - * 'name' => contact/forum name - * 'count' => counted unseen forum items + * 'id' => contact id + * 'name' => contact/forum name + * 'count' => counted unseen forum items + * @throws \Exception */ public static function countUnseenItems() { - $r = q( + $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` = %d AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen` + WHERE `item`.`uid` = ? AND `item`.`visible` AND NOT `item`.`deleted` AND `item`.`unseen` AND `contact`.`network`= 'dfrn' AND (`contact`.`forum` OR `contact`.`prv`) AND NOT `contact`.`blocked` AND NOT `contact`.`hidden` AND NOT `contact`.`pending` AND NOT `contact`.`archive` - AND `contact`.`success_update` > `failure_update` GROUP BY `contact`.`id` ", - intval(local_user()) + local_user() ); - return $r; + return DBA::toArray($stmtContacts); } }