Merge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs

[friendica.git] / mod / community.php

diff --git a/mod/community.php b/mod/community.php
index 61b523ba4889edc0be19b469ef9fb54cd43dd0dc..063e1c693eafcd5d9d5a49d0b0f9b0eecd67d981 100644 (file)
--- a/mod/community.php
+++ b/mod/community.php
@@ -5,12 +5,15 @@
 
 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\Core\Renderer;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\Item;
 
 function community_init(App $a)
 {
@@ -36,6 +39,25 @@ function community_content(App $a, $update = 0)
                return;
        }
 
+       $accounttype = null;
+
+       if ($a->argc > 2) {
+               switch ($a->argv[2]) {
+                       case 'person':
+                               $accounttype = Contact::ACCOUNT_TYPE_PERSON;
+                               break;
+                       case 'organisation':
+                               $accounttype = Contact::ACCOUNT_TYPE_ORGANISATION;
+                               break;
+                       case 'news':
+                               $accounttype = Contact::ACCOUNT_TYPE_NEWS;
+                               break;
+                       case 'community':
+                               $accounttype = Contact::ACCOUNT_TYPE_COMMUNITY;
+                               break;
+               }
+       }
+
        if ($a->argc > 1) {
                $content = $a->argv[1];
        } else {
@@ -71,9 +93,6 @@ function community_content(App $a, $update = 0)
                }
        }
 
-       require_once 'include/security.php';
-       require_once 'include/conversation.php';
-
        if (!$update) {
                $tabs = [];
 
@@ -99,8 +118,8 @@ function community_content(App $a, $update = 0)
                        ];
                }
 
-               $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');
 
@@ -134,11 +153,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;
        }
@@ -160,26 +179,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, 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));
        }
 
-       $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'),
@@ -187,24 +206,33 @@ function community_content(App $a, $update = 0)
        ]);
 }
 
-function community_getitems($start, $itemspage, $content)
+function community_getitems($start, $itemspage, $content, $accounttype)
 {
        if ($content == 'local') {
+               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`
                        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` AND `thread`.`origin`
-                       ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage)
-               );
+                       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`
-                               INNER JOIN `contact` AS `author` ON `author`.`id`=`item`.`author-id`
-                               WHERE `thread`.`uid` = 0 AND NOT `author`.`hidden` AND NOT `author`.`blocked`
-                               ORDER BY `thread`.`commented` DESC LIMIT " . intval($start) . ", " . intval($itemspage));
+               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);
        }