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

is_commentable() had some major issues when applied to the atrocity known as ConversationObject, hopefully this won't destabilise the network as it's a somewhat major permission tweak related to comments; also add any local clones to allowed_public_recips() as they should always be allowed recipients. Not sure what to do about host permissions in the event of clones. They have more than one host, and it isn't spelled out in the sent message.

Browse Source 
All of this stuff will make your head hurt.
This commit is contained in:
friendica 2013-09-20 05:45:11 -07:00
parent a44e15dc2c
commit e6d93b2516
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/ConversationObject.php
View File

@ -138,22 +138,25 @@ class Conversation extends BaseObject {
return false;
}
if(local_user() && $item->get_data_value('uid') == local_user())
$this->commentable = true;
// if(local_user() && $item->get_data_value('uid') == local_user())
// $this->commentable = true;
if($this->writable)
$this->commentable = true;
// if($this->writable)
// $this->commentable = true;
$item->set_commentable(false);
$ob_hash = (($this->observer) ? $this->observer['xchan_hash'] : '');
if(($item->get_data_value('author_xchan') === $ob_hash) || ($item->get_data_value('owner_xchan') === $ob_hash))
$item->set_commentable(true);
if($item->get_data_value('item_flags') & ITEM_NOCOMMENT) {
$this->commentable = false;
$item->set_commentable(false);
}
elseif(($this->observer) && (! $this->writable)) {
$this->commentable = can_comment_on_post($this->observer['xchan_hash'],$item->data);
elseif(($this->observer) && (! $item->is_commentable())) {
$item->set_commentable(can_comment_on_post($this->observer['xchan_hash'],$item->data));
}
$item->set_conversation($this);
$this->threads[] = $item;
return end($this->threads);

14
include/ItemObject.php
View File

@ -14,6 +14,7 @@ class Item extends BaseObject {
public $data = array();
private $template = 'conv_item.tpl';
private $comment_box_template = 'comment_item.tpl';
private $commentable = false;
private $toplevel = false;
private $children = array();
private $parent = null;
@ -295,6 +296,15 @@ class Item extends BaseObject {
return $this->threaded;
}
public function set_commentable($val) {
$this->commentable = $val;
}
public function is_commentable() {
return $this->commentable;
}
/**
* Add a child item
*/
@ -480,7 +490,9 @@ class Item extends BaseObject {
$comment_box = '';
$conv = $this->get_conversation();
if(! $conv->is_commentable())
// logger('Commentable conv: ' . $conv->is_commentable());
if(! $this->is_commentable())
return;
$template = get_markup_template($this->get_comment_box_template());

5
include/zot.php
View File

@ -983,7 +983,10 @@ function public_recips($msg) {
else
$sql = " where (( " . $col . " & " . PERMS_NETWORK . " ) or ( " . $col . " & " . PERMS_PUBLIC . ")) ";
$r = q("select channel_hash as hash from channel " . $sql );
$r = q("select channel_hash as hash from channel $sql or channel_hash = '%s' ",
dbesc($msg['notify']['sender']['hash'])
);
if(! $r)
$r = array();