X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcommunity.php;h=3c621f4261accf229c4230020a9b5d8832597847;hb=6319d9671c9924617ccd11077190b6fc74b3f5a8;hp=f1b747917ce6100ff1398e6deec73e0b6e89e6e4;hpb=03aafa8228bbdb0a294265f5865bcc0fb0f82ce1;p=friendica.git diff --git a/mod/community.php b/mod/community.php index f1b747917c..3c621f4261 100644 --- a/mod/community.php +++ b/mod/community.php @@ -2,12 +2,19 @@ /** * @file mod/community.php */ + use Friendica\App; use Friendica\Content\Nav; +use Friendica\Content\Pager; +use Friendica\Core\ACL; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\PConfig; -use Friendica\Database\DBM; +use Friendica\Core\Renderer; +use Friendica\Database\DBA; +use Friendica\Model\Contact; +use Friendica\Model\Item; +use Friendica\Model\User; function community_init(App $a) { @@ -28,6 +35,30 @@ function community_content(App $a, $update = 0) $page_style = Config::get('system', 'community_page_style'); + if ($page_style == CP_NO_INTERNAL_COMMUNITY) { + notice(L10n::t('Access denied.') . EOL); + return; + } + + $accounttype = null; + + if ($a->argc > 2) { + switch ($a->argv[2]) { + case 'person': + $accounttype = User::ACCOUNT_TYPE_PERSON; + break; + case 'organisation': + $accounttype = User::ACCOUNT_TYPE_ORGANISATION; + break; + case 'news': + $accounttype = User::ACCOUNT_TYPE_NEWS; + break; + case 'community': + $accounttype = User::ACCOUNT_TYPE_COMMUNITY; + break; + } + } + if ($a->argc > 1) { $content = $a->argv[1]; } else { @@ -63,16 +94,12 @@ function community_content(App $a, $update = 0) } } - require_once 'include/bbcode.php'; - require_once 'include/security.php'; - 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'))) { $tabs[] = [ - 'label' => L10n::t('Community'), + 'label' => L10n::t('Local Community'), 'url' => 'community/local', 'sel' => $content == 'local' ? 'active' : '', 'title' => L10n::t('Posts from local users on this server'), @@ -83,17 +110,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 Timeline'), + 'label' => L10n::t('Global Community'), 'url' => 'community/global', 'sel' => $content == 'global' ? 'active' : '', - 'title' => L10n::t('Posts from users of the federated network'), + 'title' => 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'); @@ -105,7 +132,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' => populate_acl($a->user, true), + 'acl' => ACL::getFullSelectorHTML($a->user, true), 'bang' => '', 'visitor' => 'block', 'profile_uid' => local_user(), @@ -127,11 +154,11 @@ function community_content(App $a, $update = 0) $itemspage_network = $a->force_max_items; } - $a->set_pager_itemspage($itemspage_network); + $pager = new Pager($a->query_string, $itemspage_network); - $r = community_getitems($a->pager['start'], $a->pager['itemspage'], $content); + $r = community_getitems($pager->getStart(), $pager->getItemsPerPage(), $content, $accounttype); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { info(L10n::t('No results.') . EOL); return $o; } @@ -153,26 +180,26 @@ 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); + 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); + $o .= conversation($a, $s, $pager, 'community', $update, false, 'commented', local_user()); if (!$update) { - $o .= alt_pager($a, count($r)); + $o .= $pager->renderMinimal(count($r)); } - $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'), @@ -180,26 +207,34 @@ function community_content(App $a, $update = 0) ]); } -function community_getitems($start, $itemspage, $content) +function community_getitems($start, $itemspage, $content, $accounttype) { if ($content == 'local') { - $r = dba::p("SELECT " . item_fieldlists() . " FROM `thread` + if (!is_null($accounttype)) { + $sql_accounttype = " AND `user`.`account-type` = ?"; + $values = [$accounttype, $start, $itemspage]; + } else { + $sql_accounttype = ""; + $values = [$start, $itemspage]; + } + + $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` - AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''" . - item_joins() . " AND `contact`.`self` + INNER 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` - ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage) - ); - return dba::inArray($r); + 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') { - $r = dba::p("SELECT `uri` FROM `thread` - INNER JOIN `item` ON `item`.`id` = `thread`.`iid` - WHERE `thread`.`uid` = 0 - ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)); - return dba::inArray($r); + if (!is_null($accounttype)) { + $condition = ["`uid` = ? AND `owner`.`contact-type` = ?", 0, $accounttype]; + } else { + $condition = ['uid' => 0]; + } + + $r = Item::selectThreadForUser(0, ['uri'], $condition, ['order' => ['commented' => true], 'limit' => [$start, $itemspage]]); + return DBA::toArray($r); } // Should never happen