aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Dent <dentm42@gmail.com>2018-10-28 03:22:22 +0100
committerM. Dent <dentm42@gmail.com>2018-10-28 03:22:22 +0100
commit3d9b1fd343b57573a29bf7e65d0055eb1d92398d (patch)
tree42748dbfe707b14a4d578783daf04fc1758cb409
parente72b0edce2e98406d121d1fb94e287ad1ba51271 (diff)
parent96bed3a623bf6bb832778b6957cd278c2a946c20 (diff)
downloadvolse-hubzilla-3d9b1fd343b57573a29bf7e65d0055eb1d92398d.tar.gz
volse-hubzilla-3d9b1fd343b57573a29bf7e65d0055eb1d92398d.tar.bz2
volse-hubzilla-3d9b1fd343b57573a29bf7e65d0055eb1d92398d.zip
Merge branch 'dev' into 'dev'
fix issues with forum handling in mod network and ping. also some code cleanup. See merge request hubzilla/core!1354
-rw-r--r--Zotlabs/Module/Network.php17
-rw-r--r--Zotlabs/Module/Ping.php17
2 files changed, 24 insertions, 10 deletions
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index e8ee1eef9..294e11c52 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -258,12 +258,18 @@ class Network extends \Zotlabs\Web\Controller {
}
elseif($pf && $unseen && $nouveau) {
- $ttype = TERM_FORUM;
// This is for nouveau view public forum cid queries (if a forum notification is clicked)
- $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'");
+ $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'",
+ intval(local_channel()),
+ intval(TERM_FORUM),
+ dbesc($cid_r[0]['xchan_name'])
+ );
- $p = ids_to_querystr($p, 'parent');
- $sql_extra = " AND ( owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR item.parent IN ( $p ) ) AND item_unseen = 1 ";
+ $p_str = ids_to_querystr($p, 'parent');
+ if($p_str)
+ $p_sql = " OR item.parent IN ( $p_str ) ";
+
+ $sql_extra = " AND ( owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' OR owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' $p_sql ) AND item_unseen = 1 ";
}
else {
// This is for threaded view cid queries (e.g. if a forum is selected from the forum filter)
@@ -273,6 +279,9 @@ class Network extends \Zotlabs\Web\Controller {
$p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'");
$p_str = ids_to_querystr(array_merge($p1,$p2),'parent');
+ if(! $p_str)
+ killme();
+
$sql_extra = " AND item.parent IN ( $p_str ) ";
}
}
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index 2ad4f1277..75e8843d6 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -635,20 +635,25 @@ class Ping extends \Zotlabs\Web\Controller {
$forums = get_forum_channels(local_channel());
if($forums) {
- $perms_sql = item_permissions_sql(local_channel()) . item_normal();
+ $perms_sql = item_permissions_sql(local_channel());
+ $item_normal = item_normal();
$fcount = count($forums);
$forums['total'] = 0;
for($x = 0; $x < $fcount; $x ++) {
- $ttype = TERM_FORUM;
- $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($forums[$x]['xchan_name']) . "'");
- $p = ids_to_querystr($p, 'parent');
+ $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'",
+ intval(local_channel()),
+ intval(TERM_FORUM),
+ dbesc($forums[$x]['xchan_hash'])
+ );
- $pquery = (($p) ? "OR parent IN ( $p )" : '');
+ $p_str = ids_to_querystr($p, 'parent');
+ $p_sql = (($p_str) ? "OR parent IN ( $p_str )" : '');
$r = q("select sum(item_unseen) as unseen from item
- where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ",
+ where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $perms_sql $item_normal",
intval(local_channel()),
+ dbesc($forums[$x]['xchan_hash']),
dbesc($forums[$x]['xchan_hash'])
);
if($r[0]['unseen']) {