jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3267 from annando/issue-3248

Browse source 
Issue 3248: Make communityhome work again.
This commit is contained in:
Tobias Diekershoff 2017-03-26 08:03:46 +02:00 committed by GitHub
commit 632be78b55
1 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
mod/community.php
View file

@ -1,12 +1,12 @@
<?php <?php
use \Friendica\Core\Config;
function community_init(App $a) { function community_init(App $a) {
if (! local_user()) { if (! local_user()) {
unset($_SESSION['theme']); unset($_SESSION['theme']);
unset($_SESSION['mobile-theme']); unset($_SESSION['mobile-theme']);
} }
} }
@ -14,16 +14,12 @@ function community_content(App $a, $update = 0) {
$o = ''; $o = '';
// Currently the community page isn't able to handle update requests if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
if ($update)
return;
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }
if(get_config('system','community_page_style') == CP_NO_COMMUNITY_PAGE) { if (Config::get('system','community_page_style') == CP_NO_COMMUNITY_PAGE) {
notice( t('Not available.') . EOL); notice( t('Not available.') . EOL);
return; return;
} }
@ -34,15 +30,15 @@ function community_content(App $a, $update = 0) {
$o .= '<h3>' . t('Community') . '</h3>'; $o .= '<h3>' . t('Community') . '</h3>';
if(! $update) { if (! $update) {
nav_set_selected('community'); nav_set_selected('community');
} }
if(x($a->data,'search')) if (x($a->data,'search')) {
$search = notags(trim($a->data['search'])); $search = notags(trim($a->data['search']));
else } else {
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
}
// Here is the way permissions work in this module... // Here is the way permissions work in this module...
// Only public posts can be shown // Only public posts can be shown
@ -55,7 +51,7 @@ function community_content(App $a, $update = 0) {
return $o; return $o;
} }
$maxpostperauthor = get_config('system','max_author_posts_community_page'); $maxpostperauthor = Config::get('system','max_author_posts_community_page');
if ($maxpostperauthor != 0) { if ($maxpostperauthor != 0) {
$count = 1; $count = 1;
@ -65,23 +61,24 @@ function community_content(App $a, $update = 0) {
do { do {
foreach ($r AS $row=>$item) { foreach ($r AS $row=>$item) {
if ($previousauthor == $item["author-link"]) if ($previousauthor == $item["author-link"]) {
++$numposts; ++$numposts;
else } else {
$numposts = 0; $numposts = 0;
}
$previousauthor = $item["author-link"]; $previousauthor = $item["author-link"];
if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) if (($numposts < $maxpostperauthor) AND (sizeof($s) < $a->pager['itemspage'])) {
$s[] = $item; $s[] = $item;
} }
if ((sizeof($s) < $a->pager['itemspage'])) }
if ((sizeof($s) < $a->pager['itemspage'])) {
$r = community_getitems($a->pager['start'] + ($count * $a->pager['itemspage']), $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']) AND (++$count < 50) AND (sizeof($r) > 0));
} else } else {
$s = $r; $s = $r;
}
// we behave the same in message lists as the search module // we behave the same in message lists as the search module
$o .= conversation($a, $s, 'community', $update); $o .= conversation($a, $s, 'community', $update);
@ -92,9 +89,9 @@ function community_content(App $a, $update = 0) {
} }
function community_getitems($start, $itemspage) { function community_getitems($start, $itemspage) {
if (get_config('system','community_page_style') == CP_GLOBAL_COMMUNITY) if (Config::get('system','community_page_style') == CP_GLOBAL_COMMUNITY) {
return(community_getpublicitems($start, $itemspage)); return(community_getpublicitems($start, $itemspage));
}
$r = qu("SELECT %s $r = qu("SELECT %s
FROM `thread` FROM `thread`
INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall` INNER JOIN `user` ON `user`.`uid` = `thread`.`uid` AND NOT `user`.`hidewall`