Merge pull request #8765 from annando/fix-pubkey

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

diff --git a/src/Content/Widget/CalendarExport.php b/src/Content/Widget/CalendarExport.php
index 8d9309a5bd4a3ccfb787f2663919fa09478c997b..dda3513fec0a917c3c84053a983043f4b82a87d2 100644 (file)
--- a/src/Content/Widget/CalendarExport.php
+++ b/src/Content/Widget/CalendarExport.php
@@ -1,14 +1,29 @@
 <?php
-
-/*
- * @file src/Content/Widget/CalendarExport.php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
 
 namespace Friendica\Content\Widget;
 
 use Friendica\Content\Feature;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
+use Friendica\DI;
 
 /**
  * TagCloud widget
@@ -18,18 +33,19 @@ use Friendica\Core\Renderer;
 class CalendarExport
 {
        /**
-        * @brief Get the events widget.
+        * 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.
 
@@ -56,13 +72,13 @@ 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 = Renderer::getMarkupTemplate("events_aside.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"),
+                       '$etitle'      => DI::l10n()->t("Export"),
+                       '$export_ical' => DI::l10n()->t("Export calendar as ical"),
+                       '$export_csv'  => DI::l10n()->t("Export calendar as csv"),
                        '$user'        => $user
                ]);