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

Append author's contact id to allowed contacts to prevent empty ACL for private events

Browse source
This commit is contained in:
Hypolite Petovan 2020-12-21 00:27:12 -05:00
parent 3f32d04c44
commit a7b8c4f8d5
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
mod/events.php
View file

@ -163,31 +163,39 @@ function events_post(App $a)
if ($share) { if ($share) {
$str_contact_allow = '';
$str_group_allow = '';
$str_contact_deny = '';
$str_group_deny = '';
$aclFormatter = DI::aclFormatter(); if (($_REQUEST['visibility'] ?? '') !== 'public') {
$user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
if (!DBA::isResult($user)) {
return;
}
$str_group_allow = $aclFormatter->toString($_POST['group_allow'] ?? ''); $aclFormatter = DI::aclFormatter();
$str_contact_allow = $aclFormatter->toString($_POST['contact_allow'] ?? ''); $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? '';
$str_group_deny = $aclFormatter->toString($_POST['group_deny'] ?? ''); $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? '';
$str_contact_deny = $aclFormatter->toString($_POST['contact_deny'] ?? ''); $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? '';
$str_group_deny = isset($_REQUEST['group_deny']) ? $aclFormatter->toString($_REQUEST['group_deny']) : $user['deny_gid'] ?? '';
// Undo the pseudo-contact of self, since there are real contacts now // Since we know from the visibility parameter it should be private, we have to prevent the empty ACL case
if (strpos($str_contact_allow, '<' . $self . '>') !== false) { // that would make the item public. So we always append the author's contact id to the allowed contacts.
$str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow); // See https://github.com/friendica/friendica/issues/9672
} $str_contact_allow .= $aclFormatter->toString(\Friendica\Model\Contact::getPublicIdByUserId($uid));
// Make sure to set the `private` field as true. This is necessary to
// have the posts show up correctly in Diaspora if an event is created
// as visible only to self at first, but then edited to display to others.
if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
$private_event = true;
} }
} else { } else {
// Note: do not set `private` field for self-only events. It will
// keep even you from seeing them!
$str_contact_allow = '<' . $self . '>'; $str_contact_allow = '<' . $self . '>';
$str_group_allow = $str_contact_deny = $str_group_deny = ''; $str_group_allow = $str_contact_deny = $str_group_deny = '';
} }
// Make sure to set the `private` field as true. This is necessary to
// have the posts show up correctly in Diaspora if an event is created
// as visible only to self at first, but then edited to display to others.
if (strlen($str_group_allow) || strlen($str_contact_allow) || strlen($str_group_deny) || strlen($str_contact_deny)) {
$private_event = true;
}
$datarray = []; $datarray = [];
$datarray['start'] = $start; $datarray['start'] = $start;