Avoid notices whwn creating events

[friendica.git/.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index ff89698..aa38fa6 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -24,8 +24,8 @@
  */
 
 use Friendica\App;
-use Friendica\Content\Feature;
 use Friendica\Content\Nav;
+use Friendica\Content\Text\BBCode;
 use Friendica\Content\Widget;
 use Friendica\Core\Renderer;
 use Friendica\Core\Session;
@@ -36,17 +36,18 @@ use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Module\BaseProfile;
+use Friendica\Network\HTTPException;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Temporal;
 
 function cal_init(App $a)
 {
        if (DI::config()->get('system', 'block_public') && !Session::isAuthenticated()) {
-               throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
+               throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
        }
 
        if ($a->argc < 2) {
-               throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
+               throw new HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
        }
 
        Nav::setSelected('events');
@@ -54,7 +55,7 @@ function cal_init(App $a)
        $nick = $a->argv[1];
        $user = DBA::selectFirst('user', [], ['nickname' => $nick, 'blocked' => false]);
        if (!DBA::isResult($user)) {
-               throw new \Friendica\Network\HTTPException\NotFoundException();
+               throw new HTTPException\NotFoundException();
        }
 
        $a->data['user'] = $user;
@@ -66,18 +67,21 @@ function cal_init(App $a)
                return;
        }
 
-       $profile = Profile::getByNickname($nick, $a->profile_uid);
+       $a->profile = Profile::getByNickname($nick, $a->profile_uid);
+       if (empty($a->profile)) {
+               throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+       }
 
-       $account_type = Contact::getAccountType($profile);
+       $account_type = Contact::getAccountType($a->profile);
 
-       $tpl = Renderer::getMarkupTemplate("widget/vcard.tpl");
+       $tpl = Renderer::getMarkupTemplate('widget/vcard.tpl');
 
        $vcard_widget = Renderer::replaceMacros($tpl, [
-               '$name' => $profile['name'],
-               '$photo' => $profile['photo'],
-               '$addr' => (($profile['addr'] != "") ? $profile['addr'] : ""),
+               '$name' => $a->profile['name'],
+               '$photo' => $a->profile['photo'],
+               '$addr' => $a->profile['addr'] ?: '',
                '$account_type' => $account_type,
-               '$pdesc' => (($profile['pdesc'] != "") ? $profile['pdesc'] : ""),
+               '$about' => BBCode::convert($a->profile['about']),
        ]);
 
        $cal_widget = Widget\CalendarExport::getHTML();
@@ -99,6 +103,11 @@ function cal_content(App $a)
        // get the translation strings for the callendar
        $i18n = Event::getStrings();
 
+       DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.min.css');
+       DI::page()->registerStylesheet('view/asset/fullcalendar/dist/fullcalendar.print.min.css', 'print');
+       DI::page()->registerFooterScript('view/asset/moment/min/moment-with-locales.min.js');
+       DI::page()->registerFooterScript('view/asset/fullcalendar/dist/fullcalendar.min.js');
+
        $htpl = Renderer::getMarkupTemplate('event_head.tpl');
        DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
                '$module_url' => '/cal/' . $a->data['user']['nickname'],
@@ -120,6 +129,9 @@ function cal_content(App $a)
        // Setup permissions structures
        $owner_uid = intval($a->data['user']['uid']);
        $nick = $a->data['user']['nickname'];
+       if (empty($a->profile)) {
+               throw new HTTPException\NotFoundException(DI::l10n()->t('User not found.'));
+       }
 
        $contact_id = Session::getRemoteContactID($a->profile['uid']);
 
@@ -128,7 +140,7 @@ function cal_content(App $a)
        $is_owner = local_user() == $a->profile['uid'];
 
        if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
-               notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this profile has been restricted.'));
                return;
        }
 
@@ -286,13 +298,6 @@ function cal_content(App $a)
                        return;
                }
 
-               // Test permissions
-               // Respect the export feature setting for all other /cal pages if it's not the own profile
-               if ((local_user() !== $owner_uid) && !Feature::isEnabled($owner_uid, "export_calendar")) {
-                       notice(DI::l10n()->t('Permission denied.') . EOL);
-                       DI::baseUrl()->redirect('cal/' . $nick);
-               }
-
                // Get the export data by uid
                $evexport = Event::exportListByUserId($owner_uid, $format);