diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-09-05 12:17:50 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-09-05 12:17:50 +0200 |
| commit | 5d1539df75ae1e719da77e64c738ae3ea2c84f55 (patch) | |
| tree | 4c0a690fb1efa2cdf7fa8bc7c46ba530fde6666d | |
| parent | a821682c8c165077947781bca2064922884f6e7d (diff) | |
| parent | 41ccb61c2e2f2123ae510a39ebd048a56832825e (diff) | |
| download | volse-hubzilla-5d1539df75ae1e719da77e64c738ae3ea2c84f55.tar.gz volse-hubzilla-5d1539df75ae1e719da77e64c738ae3ea2c84f55.tar.bz2 volse-hubzilla-5d1539df75ae1e719da77e64c738ae3ea2c84f55.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Module/Item.php | 12 | ||||
| -rw-r--r-- | include/zot.php | 17 |
2 files changed, 7 insertions, 22 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index a24d6da9c..640b4fa5c 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -29,7 +29,7 @@ use \Zotlabs\Lib as Zlib; class Item extends \Zotlabs\Web\Controller { function post() { - + // This will change. Figure out who the observer is and whether or not // they have permission to post here. Else ignore the post. @@ -237,12 +237,10 @@ class Item extends \Zotlabs\Web\Controller { if($parent) { logger('mod_item: item_post parent=' . $parent); $can_comment = false; - - $can_comment = can_comment_on_post($observer['xchan_hash'],$parent_item); - if (!$can_comment) { - if((array_key_exists('owner',$parent_item)) && intval($parent_item['owner']['abook_self'])==1 ) - $can_comment = perm_is_allowed($profile_uid,$observer['xchan_hash'],'post_comments'); - } + if((array_key_exists('owner',$parent_item)) && intval($parent_item['owner']['abook_self'])) + $can_comment = perm_is_allowed($profile_uid,$observer['xchan_hash'],'post_comments'); + else + $can_comment = can_comment_on_post($observer['xchan_hash'],$parent_item); if(! $can_comment) { notice( t('Permission denied.') . EOL) ; diff --git a/include/zot.php b/include/zot.php index 3523dd2ec..52102e147 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1808,21 +1808,8 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ else { $arr['item_wall'] = 0; } - - $allowed = (perm_is_allowed($channel['channel_id'],$sender['hash'],$perm) && (! $tag_delivery) && (! $local_public)); - - if(! $allowed && $perm == 'post_comments') { -logger("Channel = ".intval($channel['channel_id'])); - $parent = q("select * from item where mid = '%s' and uid = %d limit 1", - dbesc($arr['parent_mid']), - intval($channel['channel_id']) - ); - if ($parent) { - $allowed = can_comment_on_post($d['hash'],$parent[0]); - } - } - - if (! $allowed) { + + if((! perm_is_allowed($channel['channel_id'],$sender['hash'],$perm)) && (! $tag_delivery) && (! $local_public)) { logger("permission denied for delivery to channel {$channel['channel_id']} {$channel['channel_address']}"); $DR->update('permission denied'); $result[] = $DR->get(); |