Enable calendar export for public_calendar = true

diff --git a/src/Module/Calendar/Export.php b/src/Module/Calendar/Export.php
index 68c936927983f91b17ac9f6626375bdb3cc1daa2..3d45c7f9282b0cb07d1ffceff5fc4c6a1aa6c3d4 100644 (file)
--- a/src/Module/Calendar/Export.php
+++ b/src/Module/Calendar/Export.php
@@ -23,11 +23,14 @@ namespace Friendica\Module\Calendar;
 
 use Friendica\App;
 use Friendica\BaseModule;
+use Friendica\Content\Feature;
 use Friendica\Core\L10n;
 use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\Model\Event;
+use Friendica\Model\Profile;
 use Friendica\Model\User;
 use Friendica\Module\Response;
+use Friendica\Module\Security\Login;
 use Friendica\Navigation\SystemMessages;
 use Friendica\Network\HTTPException;
 use Friendica\Util\Profiler;
@@ -47,25 +50,39 @@ class Export extends BaseModule
        protected $session;
        /** @var SystemMessages */
        protected $sysMessages;
+       /** @var App */
+       protected $app;
 
-       public function __construct(L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, array $server, array $parameters = [])
+       public function __construct(App $app, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, IHandleUserSessions $session, SystemMessages $sysMessages, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
                $this->session     = $session;
                $this->sysMessages = $sysMessages;
+               $this->app         = $app;
        }
 
        protected function rawContent(array $request = [])
        {
-               if (!$this->session->getLocalUserId()) {
-                       throw new HTTPException\UnauthorizedException($this->t('Permission denied.'));
+               $nickname = $this->parameters['nickname'] ?? null;
+               if (!$nickname) {
+                       throw new HTTPException\BadRequestException();
                }
 
-               $owner = User::getByNickname($this->parameters['nickname'], ['uid']);
-               if (empty($owner)) {
+               $owner = Profile::load($this->app, $nickname, false);
+               if (!$owner || $owner['account_expired'] || $owner['account_removed']) {
                        throw new HTTPException\NotFoundException($this->t('User not found.'));
                }
+
+               if (!$this->session->isAuthenticated() && $owner['hidewall']) {
+                       $this->baseUrl->redirect('profile/' . $nickname . '/restricted');
+               }
+
+               if (!$this->session->isAuthenticated() && !Feature::isEnabled($owner['uid'], 'public_calendar')) {
+                       $this->sysMessages->addNotice($this->t('Permission denied.'));
+                       $this->baseUrl->redirect('profile/' . $nickname);
+               }
+
                $ownerUid = $owner['uid'];
                $format   = $this->parameters['format'] ?: static::DEFAULT_EXPORT;
 

diff --git a/src/Module/Calendar/Show.php b/src/Module/Calendar/Show.php
index 09c319ac9d2329dffb7b20cad1513987534463cf..e5e7c2444fa431364497f5314d2d112212b5cfff 100644 (file)
--- a/src/Module/Calendar/Show.php
+++ b/src/Module/Calendar/Show.php
@@ -64,7 +64,7 @@ class Show extends BaseModule
 
        protected function content(array $request = []): string
        {
-               $nickname = $this->parameters['nickname'] ?? $this->app->getLoggedInUserNickname();
+               $nickname = $this->parameters['nickname'] ?? $this->session->getLocalUserNickname();
                if (!$nickname) {
                        throw new HTTPException\UnauthorizedException();
                }