aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module/Zotfeed.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-22 17:52:30 -0700
committerredmatrix <git@macgirvin.com>2016-05-22 17:52:30 -0700
commit5e0698ba8731e7e4659a24c0ab4fa9c4a1aef173 (patch)
tree36b583cd45fd7ba27f505678a9a080a7894d7a1c /Zotlabs/Module/Zotfeed.php
parentd7d347469c234e14d5d097fa3f6ab90f715324aa (diff)
downloadvolse-hubzilla-5e0698ba8731e7e4659a24c0ab4fa9c4a1aef173.tar.gz
volse-hubzilla-5e0698ba8731e7e4659a24c0ab4fa9c4a1aef173.tar.bz2
volse-hubzilla-5e0698ba8731e7e4659a24c0ab4fa9c4a1aef173.zip
turn the oft-repeated block_public ... check into a function observer_prohibited()
Diffstat (limited to 'Zotlabs/Module/Zotfeed.php')
-rw-r--r--Zotlabs/Module/Zotfeed.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/Zotlabs/Module/Zotfeed.php b/Zotlabs/Module/Zotfeed.php
index 28040149f..6b505c890 100644
--- a/Zotlabs/Module/Zotfeed.php
+++ b/Zotlabs/Module/Zotfeed.php
@@ -15,7 +15,7 @@ class Zotfeed extends \Zotlabs\Web\Controller {
if(! $mindate)
$mindate = datetime_convert('UTC','UTC', 'now - 14 days');
- if(get_config('system','block_public') && (! get_account_id()) && (! remote_channel())) {
+ if(observer_prohibited()) {
$result['message'] = 'Public access denied';
json_return_and_die($result);
}
@@ -45,8 +45,6 @@ class Zotfeed extends \Zotlabs\Web\Controller {
$result['messages'] = zot_feed($r[0]['channel_id'],$observer['xchan_hash'],array('mindate' => $mindate));
$result['success'] = true;
json_return_and_die($result);
-
-
}
}