X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fcommunity.php;h=61922ef88a08dae0027e738ece63022e6dc99b12;hb=4a3544582c570d43f7d274ddbae7ea835176cbd9;hp=0eaccc0db0306ead6ead5241690d2f37e524408c;hpb=f10481796778811d3ea4fab803508be3ffde84e4;p=friendica.git diff --git a/mod/community.php b/mod/community.php index 0eaccc0db0..61922ef88a 100644 --- a/mod/community.php +++ b/mod/community.php @@ -4,36 +4,31 @@ */ use Friendica\App; +use Friendica\Content\Feature; use Friendica\Content\Nav; +use Friendica\Content\Pager; +use Friendica\Content\Widget\TrendingTags; use Friendica\Core\ACL; -use Friendica\Core\Config; -use Friendica\Core\L10n; -use Friendica\Core\PConfig; +use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\Database\DBA; -use Friendica\Model\Contact; +use Friendica\DI; use Friendica\Model\Item; - -function community_init(App $a) -{ - if (!local_user()) { - unset($_SESSION['theme']); - unset($_SESSION['mobile-theme']); - } -} +use Friendica\Model\User; function community_content(App $a, $update = 0) { $o = ''; - if (Config::get('system', 'block_public') && !local_user() && !remote_user()) { - notice(L10n::t('Public access denied.') . EOL); + if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) { + notice(DI::l10n()->t('Public access denied.') . EOL); return; } - $page_style = Config::get('system', 'community_page_style'); + $page_style = DI::config()->get('system', 'community_page_style'); if ($page_style == CP_NO_INTERNAL_COMMUNITY) { - notice(L10n::t('Access denied.') . EOL); + notice(DI::l10n()->t('Access denied.') . EOL); return; } @@ -42,16 +37,16 @@ function community_content(App $a, $update = 0) if ($a->argc > 2) { switch ($a->argv[2]) { case 'person': - $accounttype = Contact::ACCOUNT_TYPE_PERSON; + $accounttype = User::ACCOUNT_TYPE_PERSON; break; case 'organisation': - $accounttype = Contact::ACCOUNT_TYPE_ORGANISATION; + $accounttype = User::ACCOUNT_TYPE_ORGANISATION; break; case 'news': - $accounttype = Contact::ACCOUNT_TYPE_NEWS; + $accounttype = User::ACCOUNT_TYPE_NEWS; break; case 'community': - $accounttype = Contact::ACCOUNT_TYPE_COMMUNITY; + $accounttype = User::ACCOUNT_TYPE_COMMUNITY; break; } } @@ -59,7 +54,7 @@ function community_content(App $a, $update = 0) if ($a->argc > 1) { $content = $a->argv[1]; } else { - if (!empty(Config::get('system', 'singleuser'))) { + if (!empty(DI::config()->get('system', 'singleuser'))) { // On single user systems only the global page does make sense $content = 'global'; } else { @@ -69,7 +64,7 @@ function community_content(App $a, $update = 0) } if (!in_array($content, ['local', 'global'])) { - notice(L10n::t('Community option not available.') . EOL); + notice(DI::l10n()->t('Community option not available.') . EOL); return; } @@ -86,22 +81,20 @@ function community_content(App $a, $update = 0) } if (!$available) { - notice(L10n::t('Not available.') . EOL); + notice(DI::l10n()->t('Not available.') . EOL); return; } } - require_once 'include/conversation.php'; - if (!$update) { $tabs = []; - if ((local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(Config::get('system', 'singleuser'))) { + if ((local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_USERS_ON_SERVER])) && empty(DI::config()->get('system', 'singleuser'))) { $tabs[] = [ - 'label' => L10n::t('Local Community'), + 'label' => DI::l10n()->t('Local Community'), 'url' => 'community/local', 'sel' => $content == 'local' ? 'active' : '', - 'title' => L10n::t('Posts from local users on this server'), + 'title' => DI::l10n()->t('Posts from local users on this server'), 'id' => 'community-local-tab', 'accesskey' => 'l' ]; @@ -109,17 +102,17 @@ function community_content(App $a, $update = 0) if (local_user() || in_array($page_style, [CP_USERS_AND_GLOBAL, CP_GLOBAL_COMMUNITY])) { $tabs[] = [ - 'label' => L10n::t('Global Community'), + 'label' => DI::l10n()->t('Global Community'), 'url' => 'community/global', 'sel' => $content == 'global' ? 'active' : '', - 'title' => L10n::t('Posts from users of the whole federated network'), + 'title' => DI::l10n()->t('Posts from users of the whole federated network'), 'id' => 'community-global-tab', 'accesskey' => 'g' ]; } - $tab_tpl = get_markup_template('common_tabs.tpl'); - $o .= replace_macros($tab_tpl, ['$tabs' => $tabs]); + $tab_tpl = Renderer::getMarkupTemplate('common_tabs.tpl'); + $o .= Renderer::replaceMacros($tab_tpl, ['$tabs' => $tabs]); Nav::setSelected('community'); @@ -131,7 +124,7 @@ function community_content(App $a, $update = 0) 'default_location' => $a->user['default-location'], 'nickname' => $a->user['nickname'], 'lockstate' => (is_array($a->user) && (strlen($a->user['allow_cid']) || strlen($a->user['allow_gid']) || strlen($a->user['deny_cid']) || strlen($a->user['deny_gid'])) ? 'lock' : 'unlock'), - 'acl' => ACL::getFullSelectorHTML($a->user, true), + 'acl' => ACL::getFullSelectorHTML(DI::page(), $a->user, true), 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), @@ -141,10 +134,10 @@ function community_content(App $a, $update = 0) } // check if we serve a mobile device and get the user settings accordingly - if ($a->is_mobile) { - $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_mobile_network', 20); + if (DI::mode()->isMobile()) { + $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_mobile_network', 20); } else { - $itemspage_network = PConfig::get(local_user(), 'system', 'itemspage_network', 40); + $itemspage_network = DI::pConfig()->get(local_user(), 'system', 'itemspage_network', 40); } // now that we have the user settings, see if the theme forces @@ -153,16 +146,16 @@ function community_content(App $a, $update = 0) $itemspage_network = $a->force_max_items; } - $a->setPagerItemsPage($itemspage_network); + $pager = new Pager(DI::args()->getQueryString(), $itemspage_network); - $r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content, $accounttype); + $r = community_getitems($pager->getStart(), $pager->getItemsPerPage(), $content, $accounttype); if (!DBA::isResult($r)) { - info(L10n::t('No results.') . EOL); + info(DI::l10n()->t('No results.') . EOL); return $o; } - $maxpostperauthor = (int) Config::get('system', 'max_author_posts_community_page'); + $maxpostperauthor = (int) DI::config()->get('system', 'max_author_posts_community_page'); if (($maxpostperauthor != 0) && ($content == 'local')) { $count = 1; @@ -179,30 +172,38 @@ function community_content(App $a, $update = 0) } $previousauthor = $item["author-link"]; - if (($numposts < $maxpostperauthor) && (count($s) < $a->pager['itemspage'])) { + if (($numposts < $maxpostperauthor) && (count($s) < $pager->getItemsPerPage())) { $s[] = $item; } } - if (count($s) < $a->pager['itemspage']) { - $r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage'], $content, $accounttype); + if (count($s) < $pager->getItemsPerPage()) { + $r = community_getitems($pager->getStart() + ($count * $pager->getItemsPerPage()), $pager->getItemsPerPage(), $content, $accounttype); } - } while ((count($s) < $a->pager['itemspage']) && ( ++$count < 50) && (count($r) > 0)); + } while ((count($s) < $pager->getItemsPerPage()) && ( ++$count < 50) && (count($r) > 0)); } else { $s = $r; } - $o .= conversation($a, $s, 'community', $update, false, 'commented', local_user()); + $o .= conversation($a, $s, $pager, 'community', $update, false, 'commented', local_user()); if (!$update) { - $o .= alt_pager($a, count($r)); + $o .= $pager->renderMinimal(count($r)); + } + + if (empty(DI::page()['aside'])) { + DI::page()['aside'] = ''; + } + + if (Feature::isEnabled(local_user(), 'trending_tags')) { + DI::page()['aside'] .= TrendingTags::getHTML($content); } - $t = get_markup_template("community.tpl"); - return replace_macros($t, [ + $t = Renderer::getMarkupTemplate("community.tpl"); + return Renderer::replaceMacros($t, [ '$content' => $o, '$header' => '', - '$show_global_community_hint' => ($content == 'global') && Config::get('system', 'show_global_community_hint'), - '$global_community_hint' => L10n::t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.") + '$show_global_community_hint' => ($content == 'global') && DI::config()->get('system', 'show_global_community_hint'), + '$global_community_hint' => DI::l10n()->t("This community stream shows all public posts received by this node. They may not reflect the opinions of this node’s users.") ]); } @@ -217,19 +218,20 @@ function community_getitems($start, $itemspage, $content, $accounttype) $values = [$start, $itemspage]; } + /// @todo Use "unsearchable" here as well (instead of "hidewall") $r = DBA::p("SELECT `item`.`uri`, `author`.`url` AS `author-link` FROM `thread` - INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall` - INNER JOIN `item` ON `item`.`id` = `thread`.`iid` - INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` + STRAIGHT_JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall` + STRAIGHT_JOIN `item` ON `item`.`id` = `thread`.`iid` + STRAIGHT_JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id` WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated` AND NOT `thread`.`private` AND `thread`.`wall` AND `thread`.`origin` $sql_accounttype ORDER BY `thread`.`commented` DESC LIMIT ?, ?", $values); return DBA::toArray($r); } elseif ($content == 'global') { if (!is_null($accounttype)) { - $condition = ["`uid` = ? AND `owner`.`contact-type` = ?", 0, $accounttype]; + $condition = ["`uid` = ? AND NOT `author`.`unsearchable` AND NOT `owner`.`unsearchable` AND `owner`.`contact-type` = ?", 0, $accounttype]; } else { - $condition = ['uid' => 0]; + $condition = ["`uid` = ? AND NOT `author`.`unsearchable` AND NOT `owner`.`unsearchable`", 0]; } $r = Item::selectThreadForUser(0, ['uri'], $condition, ['order' => ['commented' => true], 'limit' => [$start, $itemspage]]);