keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor outgoing comment ability for off network contacts

Browse source
This commit is contained in:
Friendika 2010-11-08 20:43:58 -08:00
parent 188b1d2d6f
commit e521dfd5e6
2 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/items.php
View file

@ -909,14 +909,14 @@ function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) {
// FIXME update content if 'updated' changes // FIXME update content if 'updated' changes
if(count($r)) { if(count($r)) {
$allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow'); $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow');
if($allow && $allow[0]['data'] != $r[0]['last-child']) { if((($allow) && ($allow[0]['data'] != $r[0]['last-child'])) || ($contact['network'] !== 'dfrn')) {
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($parent_uri), dbesc($parent_uri),
intval($importer['uid']) intval($importer['uid'])
); );
$r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
intval($allow[0]['data']), intval((($allow) ? $allow[0]['data'] : 1)),
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($item_id), dbesc($item_id),
intval($importer['uid']) intval($importer['uid'])
@ -977,7 +977,8 @@ function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) {
if($contact['network'] === 'stat') { if($contact['network'] === 'stat') {
if(strlen($datarray['title'])) if(strlen($datarray['title']))
unset($datarray['title']); unset($datarray['title']);
if(($contact['rel'] == REL_VIP) || ($contact['rel'] == REL_BUD)) // if(($contact['rel'] == REL_VIP) || ($contact['rel'] == REL_BUD))
// basically allow comments to/from any OStatus contact, unless blocked by readonly
$datarray['last-child'] = 1; $datarray['last-child'] = 1;
} }
$datarray['parent-uri'] = $item_id; $datarray['parent-uri'] = $item_id;

12
include/security.php
View file

@ -10,19 +10,21 @@ function can_write_wall(&$a,$owner) {
return true; return true;
} }
if(remote_user()) {
$r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid` $r = q("SELECT `contact`.*, `user`.`page-flags` FROM `contact` LEFT JOIN `user` on `user`.`uid` = `contact`.`uid`
WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 WHERE `contact`.`uid` = %d AND `contact`.`id` = %d AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d OR (`contact`.`network` = 'stat' AND `contact`.rel` = %d)) LIMIT 1", AND `readonly` = 0 AND ( `contact`.`rel` IN ( %d , %d ) OR `user`.`page-flags` = %d ) LIMIT 1",
intval($owner), intval($owner),
intval($_SESSION['visitor_id']), intval(remote_user()),
intval(REL_VIP), intval(REL_VIP),
intval(REL_BUD), intval(REL_BUD),
intval(PAGE_COMMUNITY), intval(PAGE_COMMUNITY)
intval(REL_FAN)
); );
}
if(count($r)) if(count($r))
return true; return true;
return false; return false;
} }