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

add some more safety checks before turning the conversation request messages back on

Browse Source
This commit is contained in:
friendica 2014-11-02 00:06:52 -07:00
parent dc5e05d334
commit 4274a2d06c
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/photos.php
View File

@ -178,7 +178,7 @@ function photo_upload($channel, $observer, $args) {
if($args['title']) if($args['title'])
$p['title'] = $args['title']; $p['title'] = $args['title'];
if($args['description']) if($args['description'])
$p['desciprion'] = $args['description']; $p['description'] = $args['description'];
$r1 = $ph->save($p); $r1 = $ph->save($p);

8
include/zot.php
View File

@ -1448,11 +1448,13 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
// Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop. // Don't do this if it's a relay post as we're the ones who are supposed to have the copy and we don't want the request to loop.
// Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting // Also don't do this if this comment came from a conversation request packet. It's possible that comments are allowed but posting
// isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type // isn't and that could cause a conversation fetch loop. We can detect these packets since they are delivered via a 'notify' packet type
// that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request). // that has a message_id element in the initial zot packet (just like the corresponding 'request' packet type which makes the request).
// We'll also check the send_stream permission, because if it isn't allowed the top level post is unlikely to be imported and
// this is just an exercise in futility.
if((! $relay) && (! $request)) if((! $relay) && (! $request) && (! $public) && perm_is_allowed($channel['channel_id'],$sender['hash'],'send_stream')) {
proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']); proc_run('php', 'include/notifier.php', 'request', $channel['channel_id'], $sender['hash'], $arr['parent_mid']);
}
continue; continue;
} }
if($relay) { if($relay) {

2
version.inc
View File

@ -1 +1 @@
2014-11-01.846 2014-11-02.847