strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Simplify user public contact id retrieval in mod/events

Browse source
This commit is contained in:
Hypolite Petovan 2020-12-30 21:10:26 -05:00
parent 934f69a426
commit f0267fc441
1 changed files with 6 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
mod/events.php
View file

@ -66,9 +66,7 @@ function events_init(App $a)
function events_post(App $a) function events_post(App $a)
{ {
Logger::debug('post', ['request' => $_REQUEST]); Logger::debug('post', ['request' => $_REQUEST]);
if (!local_user()) { if (!local_user()) {
return; return;
} }
@ -83,6 +81,8 @@ function events_post(App $a)
$adjust = intval($_POST['adjust'] ?? 0); $adjust = intval($_POST['adjust'] ?? 0);
$nofinish = intval($_POST['nofinish'] ?? 0); $nofinish = intval($_POST['nofinish'] ?? 0);
$share = intval($_POST['share'] ?? 0);
// The default setting for the `private` field in event_store() is false, so mirror that // The default setting for the `private` field in event_store() is false, so mirror that
$private_event = false; $private_event = false;
@ -150,18 +150,9 @@ function events_post(App $a)
DI::baseUrl()->redirect($onerror_path); DI::baseUrl()->redirect($onerror_path);
} }
$share = intval($_POST['share'] ?? 0); $self = \Friendica\Model\Contact::getPublicIdByUserId($uid);
$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval(local_user())
);
if (DBA::isResult($c)) {
$self = $c[0]['id'];
} else {
$self = 0;
}
$aclFormatter = DI::aclFormatter();
if ($share) { if ($share) {
$user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']); $user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
@ -169,7 +160,6 @@ function events_post(App $a)
return; return;
} }
$aclFormatter = DI::aclFormatter();
$str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? ''; $str_contact_allow = isset($_REQUEST['contact_allow']) ? $aclFormatter->toString($_REQUEST['contact_allow']) : $user['allow_cid'] ?? '';
$str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? ''; $str_group_allow = isset($_REQUEST['group_allow']) ? $aclFormatter->toString($_REQUEST['group_allow']) : $user['allow_gid'] ?? '';
$str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? ''; $str_contact_deny = isset($_REQUEST['contact_deny']) ? $aclFormatter->toString($_REQUEST['contact_deny']) : $user['deny_cid'] ?? '';
@ -183,10 +173,10 @@ function events_post(App $a)
// Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL // Since we know from the visibility parameter the item should be private, we have to prevent the empty ACL
// case that would make it public. So we always append the author's contact id to the allowed contacts. // case that would make it public. So we always append the author's contact id to the allowed contacts.
// See https://github.com/friendica/friendica/issues/9672 // See https://github.com/friendica/friendica/issues/9672
$str_contact_allow .= $aclFormatter->toString(Contact::getPublicIdByUserId($uid)); $str_contact_allow .= $aclFormatter->toString($self);
} }
} else { } else {
$str_contact_allow = '<' . $self . '>'; $str_contact_allow = $aclFormatter->toString($self);
$str_group_allow = $str_contact_deny = $str_group_deny = ''; $str_group_allow = $str_contact_deny = $str_group_deny = '';
} }