Merge pull request #8089 from mexon/mat/repair-contact-photo

[friendica.git] / src / Content / Widget / CalendarExport.php

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 2129cd515c3cddc88eb6d43bfe9f1e0aebb8aa8a..a6fea1e8a18f10eecfe6dec11c9cf1511763a313 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -8,9 +8,8 @@ namespace Friendica\Content\Widget;
 
 use Friendica\Content\Feature;
 use Friendica\Core\L10n;
-
-require_once 'boot.php';
-require_once 'include/text.php';
+use Friendica\Core\Renderer;
+use Friendica\DI;
 
 /**
  * TagCloud widget
@@ -23,11 +22,16 @@ class CalendarExport
         * @brief Get the events widget.
         *
         * @return string Formated HTML of the calendar widget.
+        * @throws \Friendica\Network\HTTPException\InternalServerErrorException
         */
        public static function getHTML() {
-               $a = get_app();
+               $a = DI::app();
+
+               if (empty($a->data['user'])) {
+                       return;
+               }
 
-               $owner_uid = $a->data['user']['uid'];
+               $owner_uid = intval($a->data['user']['uid']);
 
                // The permission testing is a little bit tricky because we have to respect many cases.
 
@@ -36,6 +40,10 @@ class CalendarExport
                        return;
                }
 
+               /*
+                * If it's a kind of profile page (intval($owner_uid)) return if the user not logged in and
+                * export feature isn't enabled.
+                */
                /*
                 * Cal logged in user (test permission at foreign profile page).
                 * If the $owner uid is available we know it is part of one of the profile pages (like /cal).
@@ -50,10 +58,10 @@ class CalendarExport
 
                // $a->data is only available if the profile page is visited. If the visited page is not part
                // of the profile page it should be the personal /events page. So we can use $a->user.
-               $user = defaults($a->data['user'], 'nickname', $a->user['nickname']);
+               $user = ($a->data['user']['nickname'] ?? '') ?: $a->user['nickname'];
 
-               $tpl = get_markup_template("events_aside.tpl");
-               $return = replace_macros($tpl, [
+               $tpl = Renderer::getMarkupTemplate("widget/events.tpl");
+               $return = Renderer::replaceMacros($tpl, [
                        '$etitle'      => L10n::t("Export"),
                        '$export_ical' => L10n::t("Export calendar as ical"),
                        '$export_csv'  => L10n::t("Export calendar as csv"),