diff --git a/src/Module/Calendar/Event/API.php b/src/Module/Calendar/Event/API.php index bd94213bc..174c0b3af 100644 --- a/src/Module/Calendar/Event/API.php +++ b/src/Module/Calendar/Event/API.php @@ -228,8 +228,8 @@ class API extends BaseModule } } else { $strAclContactAllow = $aclFormatter->toString($self); - $strAclGroupAllow = ''; - $strContactDeny = ''; + $strAclGroupAllow = ''; + $strContactDeny = ''; $strGroupDeny = ''; } diff --git a/src/Module/Calendar/Event/Form.php b/src/Module/Calendar/Event/Form.php index 6a7699126..aca80898b 100644 --- a/src/Module/Calendar/Event/Form.php +++ b/src/Module/Calendar/Event/Form.php @@ -109,7 +109,8 @@ class Form extends BaseModule $this->page->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js'); $this->page->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js'); - $htpl = Renderer::getMarkupTemplate('calendar/calendar_head.tpl'); + $htpl = Renderer::getMarkupTemplate('calendar/calendar_head.tpl'); + $this->page['htmlhead'] .= Renderer::replaceMacros($htpl, [ '$calendar_api' => $this->baseUrl . '/calendar/api/get', '$event_api' => $this->baseUrl . '/calendar/event/show', @@ -121,9 +122,9 @@ class Form extends BaseModule $share_disabled = ''; if (empty($orig_event)) { - $orig_event = User::getById($this->session->getLocalUserId(), ['allow_cid', 'allow_gid', 'deny_cid', - 'deny_gid']);; - } elseif ($orig_event['allow_cid'] !== '<' . $this->session->getLocalUserId() . '>' + $orig_event = User::getById($this->session->getLocalUserId(), + ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']); + } else if ($orig_event['allow_cid'] !== '<' . $this->session->getLocalUserId() . '>' || $orig_event['allow_gid'] || $orig_event['deny_cid'] || $orig_event['deny_gid']) { diff --git a/src/Module/Calendar/Show.php b/src/Module/Calendar/Show.php index 77b77bf58..9bcc004fd 100644 --- a/src/Module/Calendar/Show.php +++ b/src/Module/Calendar/Show.php @@ -73,7 +73,8 @@ class Show extends BaseModule $this->page->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js'); $this->page->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js'); - $htpl = Renderer::getMarkupTemplate('calendar/calendar_head.tpl'); + $htpl = Renderer::getMarkupTemplate('calendar/calendar_head.tpl'); + $this->page['htmlhead'] .= Renderer::replaceMacros($htpl, [ '$calendar_api' => 'calendar/api/get' . (!empty($this->parameters['nickname']) ? '/' . $this->parameters['nickname'] : ''), '$event_api' => 'calendar/event/show' . (!empty($this->parameters['nickname']) ? '/' . $this->parameters['nickname'] : ''),