X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fcommunity.php;h=df21263278b7f60c82abf9b7fb8e6f134a03d56a;hb=88ef61df95ed1b26e44d0b28bf22a1c682b5899a;hp=5c71667bdcc197c0c83dd1909c2a405e0a70e747;hpb=7a9456d5ac2e73229b2237074c700731c63661a6;p=friendica.git
diff --git a/mod/community.php b/mod/community.php
index 5c71667bdc..df21263278 100644
--- a/mod/community.php
+++ b/mod/community.php
@@ -2,6 +2,7 @@
use Friendica\App;
use Friendica\Core\Config;
+use Friendica\Database\DBM;
function community_init(App $a) {
if (! local_user()) {
@@ -11,7 +12,6 @@ function community_init(App $a) {
}
function community_content(App $a, $update = 0) {
-
$o = '';
if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
@@ -28,8 +28,6 @@ function community_content(App $a, $update = 0) {
require_once('include/security.php');
require_once('include/conversation.php');
-
- $o .= '
' . t('Community') . '
';
if (! $update) {
nav_set_selected('community');
}
@@ -46,7 +44,7 @@ function community_content(App $a, $update = 0) {
$r = community_getitems($a->pager['start'], $a->pager['itemspage']);
- if (! dbm::is_result($r)) {
+ if (! DBM::is_result($r)) {
info( t('No results.') . EOL);
return $o;
}
@@ -68,14 +66,14 @@ function community_content(App $a, $update = 0) {
}
$previousauthor = $item["author-link"];
- if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) {
+ if (($numposts < $maxpostperauthor) && (sizeof($s) < $a->pager['itemspage'])) {
$s[] = $item;
}
}
if ((sizeof($s) < $a->pager['itemspage'])) {
$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $a->pager['itemspage']);
}
- } while ((sizeof($s) < $a->pager['itemspage']) AND (++$count < 50) AND (sizeof($r) > 0));
+ } while ((sizeof($s) < $a->pager['itemspage']) && (++$count < 50) && (sizeof($r) > 0));
} else {
$s = $r;
}
@@ -83,43 +81,42 @@ function community_content(App $a, $update = 0) {
$o .= conversation($a, $s, 'community', $update);
- $o .= alt_pager($a, count($r));
+ $o .= alt_pager($a, count($r));
- return $o;
+ $t = get_markup_template("community.tpl");
+ return replace_macros($t, array(
+ '$content' => $o,
+ '$header' => t("Community"),
+ '$show_global_community_hint' => (Config::get('system', 'community_page_style') == CP_GLOBAL_COMMUNITY && Config::get('system', 'show_global_community_hint')),
+ '$global_community_hint' => t("This community stream shows all public posts received by this node. They may not reflect the opinions of this nodeâs users.")
+ ));
}
function community_getitems($start, $itemspage) {
if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
return(community_getpublicitems($start, $itemspage));
}
- $r = qu("SELECT %s
- FROM `thread`
+ $r = dba::p("SELECT ".item_fieldlists()." 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` = ''
- %s AND `contact`.`self`
+ AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''".
+ item_joins()." AND `contact`.`self`
WHERE `thread`.`visible` AND NOT `thread`.`deleted` AND NOT `thread`.`moderated`
AND NOT `thread`.`private` AND `thread`.`wall`
- ORDER BY `thread`.`received` DESC LIMIT %d, %d",
- item_fieldlists(), item_joins(),
- intval($start), intval($itemspage)
+ ORDER BY `thread`.`received` DESC LIMIT ".intval($start).", ".intval($itemspage)
);
- return($r);
-
+ return dba::inArray($r);
}
function community_getpublicitems($start, $itemspage) {
-
- $r = qu("SELECT %s
- FROM `thread`
- INNER JOIN `item` ON `item`.`id` = `thread`.`iid` %s
- WHERE `thread`.`uid` = 0
- ORDER BY `thread`.`created` DESC LIMIT %d, %d",
- item_fieldlists(), item_joins(),
- intval($start), intval($itemspage)
+ $r = dba::p("SELECT ".item_fieldlists()." FROM `thread`
+ INNER JOIN `item` ON `item`.`id` = `thread`.`iid` ".item_joins().
+ "WHERE `thread`.`uid` = 0 AND `verb` = ?
+ ORDER BY `thread`.`created` DESC LIMIT ".intval($start).", ".intval($itemspage),
+ ACTIVITY_POST
);
- return($r);
+ return dba::inArray($r);
}