harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rely on the pf argument to determine if we deal with a forum or not. xchan_pubforum is not set for all public forums in the forum filters for some reason.

Browse Source
This commit is contained in:
Mario Vavti 2018-06-05 11:56:30 +02:00
parent 2328dfc851
commit 7188e719ef
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Module/Network.php
View File

@ -136,6 +136,7 @@ class Network extends \Zotlabs\Web\Controller {
$file = ((x($_GET,'file')) ? $_GET['file'] : ''); $file = ((x($_GET,'file')) ? $_GET['file'] : '');
$xchan = ((x($_GET,'xchan')) ? $_GET['xchan'] : ''); $xchan = ((x($_GET,'xchan')) ? $_GET['xchan'] : '');
$net = ((x($_GET,'net')) ? $_GET['net'] : ''); $net = ((x($_GET,'net')) ? $_GET['net'] : '');
$pf = ((x($_GET,'pf')) ? $_GET['pf'] : '');
$deftag = ''; $deftag = '';
@ -156,7 +157,7 @@ class Network extends \Zotlabs\Web\Controller {
goaway(z_root() . '/network'); goaway(z_root() . '/network');
// NOTREACHED // NOTREACHED
} }
if($_GET['pf'] === '1') if($pf)
$deftag = '!{' . (($cid_r[0]['xchan_addr']) ? $cid_r[0]['xchan_addr'] : $cid_r[0]['xchan_url']) . '}'; $deftag = '!{' . (($cid_r[0]['xchan_addr']) ? $cid_r[0]['xchan_addr'] : $cid_r[0]['xchan_url']) . '}';
else else
$def_acl = [ 'allow_cid' => '<' . $cid_r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ]; $def_acl = [ 'allow_cid' => '<' . $cid_r[0]['abook_xchan'] . '>', 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => '' ];
@ -261,7 +262,7 @@ class Network extends \Zotlabs\Web\Controller {
$item_thread_top = ''; $item_thread_top = '';
if($load || $update) { if($load || $update) {
$ttype = (($cid_r[0]['xchan_pubforum']) ? TERM_FORUM : TERM_MENTION); $ttype = (($pf) ? TERM_FORUM : TERM_MENTION);
$p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal "); $p1 = q("SELECT DISTINCT parent FROM item WHERE uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' ) $item_normal ");
$p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'");
@ -350,7 +351,8 @@ class Network extends \Zotlabs\Web\Controller {
'$mid' => '', '$mid' => '',
'$verb' => $verb, '$verb' => $verb,
'$net' => $net, '$net' => $net,
'$dbegin' => $datequery2 '$dbegin' => $datequery2,
'$pf' => (($pf) ? $pf : '0'),
)); ));
} }

2
view/tpl/build_query.tpl
View File

@ -30,6 +30,7 @@
var bParam_mid = "{{$mid}}"; var bParam_mid = "{{$mid}}";
var bParam_verb = "{{$verb}}"; var bParam_verb = "{{$verb}}";
var bParam_net = "{{$net}}"; var bParam_net = "{{$net}}";
var bParam_pf = "{{$pf}}";
function buildCmd() { function buildCmd() {
var udargs = ((page_load) ? "/load" : ""); var udargs = ((page_load) ? "/load" : "");
@ -60,6 +61,7 @@
if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb; if(bParam_verb != "") bCmd = bCmd + "&verb=" + bParam_verb;
if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net; if(bParam_net != "") bCmd = bCmd + "&net=" + bParam_net;
if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page; if(bParam_page != 1) bCmd = bCmd + "&page=" + bParam_page;
if(bParam_pf != 0) bCmd = bCmd + "&pf=" + bParam_pf;
return(bCmd); return(bCmd);
} }