aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2020-01-25 14:32:35 +0000
committerMario <mario@mariovavti.com>2020-01-25 14:32:35 +0000
commit7abcdd34af8796571a0145d16a71a9009b995032 (patch)
treebecfea9625461aa38ce49a235be6294c8c9bb9db
parentfa45ea1d84f27c6b4ddfdcffeed622cca354f3d9 (diff)
downloadvolse-hubzilla-7abcdd34af8796571a0145d16a71a9009b995032.tar.gz
volse-hubzilla-7abcdd34af8796571a0145d16a71a9009b995032.tar.bz2
volse-hubzilla-7abcdd34af8796571a0145d16a71a9009b995032.zip
minor private forum notifications fixes
-rw-r--r--Zotlabs/Module/Sse_bs.php2
-rw-r--r--Zotlabs/Widget/Activity_filter.php4
2 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Sse_bs.php b/Zotlabs/Module/Sse_bs.php
index 4340876ea..90e870330 100644
--- a/Zotlabs/Module/Sse_bs.php
+++ b/Zotlabs/Module/Sse_bs.php
@@ -404,7 +404,7 @@ class Sse_bs extends Controller {
foreach($mids as $mid)
$b64mids[] = 'b64.' . base64url_encode($mid);
- $forums[$x]['notify_link'] = (($forums[$x]['private_forum']) ? $forums[$x]['xchan_url'] : z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id']);
+ $forums[$x]['notify_link'] = z_root() . '/network/?f=&pf=1&unseen=1&cid=' . $forums[$x]['abook_id'];
$forums[$x]['name'] = $forums[$x]['xchan_name'];
$forums[$x]['addr'] = $forums[$x]['xchan_addr'];
$forums[$x]['url'] = $forums[$x]['xchan_url'];
diff --git a/Zotlabs/Widget/Activity_filter.php b/Zotlabs/Widget/Activity_filter.php
index ae5c0af6e..0fc60ca9b 100644
--- a/Zotlabs/Widget/Activity_filter.php
+++ b/Zotlabs/Widget/Activity_filter.php
@@ -2,6 +2,7 @@
namespace Zotlabs\Widget;
+use App;
use Zotlabs\Lib\Apps;
class Activity_filter {
@@ -63,6 +64,7 @@ class Activity_filter {
if(feature_enabled(local_channel(),'forums_tab')) {
$forums = get_forum_channels(local_channel());
+ $channel = App::get_channel();
if($forums) {
foreach($forums as $f) {
@@ -73,7 +75,7 @@ class Activity_filter {
$fsub[] = [
'label' => $f['xchan_name'],
'img' => $f['xchan_photo_s'],
- 'url' => (($f['private_forum']) ? $f['xchan_url'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']),
+ 'url' => (($f['private_forum']) ? $f['xchan_url'] . '/?f=&zid=' . $channel['xchan_addr'] : z_root() . '/' . $cmd . '/?f=&pf=1&cid=' . $f['abook_id']),
'sel' => $forum_active,
'title' => t('Show posts to this forum'),
'lock' => (($f['private_forum']) ? 'lock' : '')