Merge pull request #9711 from MrPetovan/bug/fatal-errors

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index d82fbd818e4094058c6ab3d5bc383f74492e246f..d4a902c725bb5aefc6232660ffbf1d7e1f9c0bc6 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -163,31 +163,38 @@ function events_post(App $a)
 
 
        if ($share) {
+               $user = User::getById($uid, ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);
+               if (!DBA::isResult($user)) {
+                       return;
+               }
 
                $aclFormatter = DI::aclFormatter();
-
-               $str_group_allow   = $aclFormatter->toString($_POST['group_allow'] ?? '');
-               $str_contact_allow = $aclFormatter->toString($_POST['contact_allow'] ?? '');
-               $str_group_deny    = $aclFormatter->toString($_POST['group_deny'] ?? '');
-               $str_contact_deny  = $aclFormatter->toString($_POST['contact_deny'] ?? '');
-
-               // Undo the pseudo-contact of self, since there are real contacts now
-               if (strpos($str_contact_allow, '<' . $self . '>') !== false) {
-                       $str_contact_allow = str_replace('<' . $self . '>', '', $str_contact_allow);
-               }
-               // 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;
+               $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_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']  ?? '';
+
+               $visibility = $_REQUEST['visibility'] ?? '';
+               if ($visibility === 'public') {
+                       // The ACL selector introduced in version 2019.12 sends ACL input data even when the Public visibility is selected
+                       $str_contact_allow = $str_group_allow = $str_contact_deny = $str_group_deny = '';
+               } else if ($visibility === 'custom') {
+                       // 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.
+                       // See https://github.com/friendica/friendica/issues/9672
+                       $str_contact_allow .= $aclFormatter->toString(Contact::getPublicIdByUserId($uid));
                }
        } else {
-               // Note: do not set `private` field for self-only events. It will
-               // keep even you from seeing them!
                $str_contact_allow = '<' . $self . '>';
                $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['start']     = $start;
@@ -474,16 +481,16 @@ function events_content(App $a)
                $t_orig = $orig_event['summary']  ?? '';
                $d_orig = $orig_event['desc']     ?? '';
                $l_orig = $orig_event['location'] ?? '';
-               $eid = !empty($orig_event) ? $orig_event['id']  : 0;
-               $cid = !empty($orig_event) ? $orig_event['cid'] : 0;
-               $uri = !empty($orig_event) ? $orig_event['uri'] : '';
+               $eid = $orig_event['id'] ?? 0;
+               $cid = $orig_event['cid'] ?? 0;
+               $uri = $orig_event['uri'] ?? '';
 
                if ($cid || $mode === 'edit') {
                        $share_disabled = 'disabled="disabled"';
                }
 
-               $sdt = !empty($orig_event) ? $orig_event['start']  : 'now';
-               $fdt = !empty($orig_event) ? $orig_event['finish'] : 'now';
+               $sdt = $orig_event['start'] ?? 'now';
+               $fdt = $orig_event['finish'] ?? 'now';
 
                $tz = date_default_timezone_get();
                if (!empty($orig_event)) {