Merge pull request #8141 from annando/brief2

[friendica.git] / mod / cal.php

diff --git a/mod/cal.php b/mod/cal.php
index 5a4f0a9c51731ba275fa639aa82286ff6b0af063..1c14f9e77057f19aecdee24890c44c0a16da14b5 100644 (file)
--- a/mod/cal.php
+++ b/mod/cal.php
@@ -1,9 +1,10 @@
 <?php
 /**
  * @file mod/cal.php
- * @brief The calendar module
- *     This calendar is for profile visitors and contains only the events
- *     of the profile owner
+ * The calendar module
+ *
+ * This calendar is for profile visitors and contains only the events
+ * of the profile owner
  */
 
 use Friendica\App;
@@ -11,9 +12,7 @@ use Friendica\Content\Feature;
 use Friendica\Content\Nav;
 use Friendica\Content\Widget;
 use Friendica\Core\Config;
-use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
@@ -27,11 +26,11 @@ use Friendica\Util\Temporal;
 function cal_init(App $a)
 {
        if (Config::get('system', 'block_public') && !Session::isAuthenticated()) {
-               throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
+               throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
        }
 
        if ($a->argc < 2) {
-               throw new \Friendica\Network\HTTPException\ForbiddenException(L10n::t('Access denied.'));
+               throw new \Friendica\Network\HTTPException\ForbiddenException(DI::l10n()->t('Access denied.'));
        }
 
        Nav::setSelected('events');
@@ -67,12 +66,12 @@ function cal_init(App $a)
 
        $cal_widget = Widget\CalendarExport::getHTML();
 
-       if (empty($a->page['aside'])) {
-               $a->page['aside'] = '';
+       if (empty(DI::page()['aside'])) {
+               DI::page()['aside'] = '';
        }
 
-       $a->page['aside'] .= $vcard_widget;
-       $a->page['aside'] .= $cal_widget;
+       DI::page()['aside'] .= $vcard_widget;
+       DI::page()['aside'] .= $cal_widget;
 
        return;
 }
@@ -85,7 +84,7 @@ function cal_content(App $a)
        $i18n = Event::getStrings();
 
        $htpl = Renderer::getMarkupTemplate('event_head.tpl');
-       $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
+       DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
                '$module_url' => '/cal/' . $a->data['user']['nickname'],
                '$modparams' => 2,
                '$i18n' => $i18n,
@@ -126,7 +125,7 @@ function cal_content(App $a)
        $is_owner = local_user() == $a->profile['profile_uid'];
 
        if ($a->profile['hidewall'] && !$is_owner && !$remote_contact) {
-               notice(L10n::t('Access to this profile has been restricted.') . EOL);
+               notice(DI::l10n()->t('Access to this profile has been restricted.') . EOL);
                return;
        }
 
@@ -221,7 +220,7 @@ function cal_content(App $a)
                        foreach ($r as $rr) {
                                $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
                                if (empty($links[$j])) {
-                                       $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
+                                       $links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
                                }
                        }
                }
@@ -257,17 +256,17 @@ function cal_content(App $a)
 
                $o = Renderer::replaceMacros($tpl, [
                        '$tabs' => $tabs,
-                       '$title' => L10n::t('Events'),
-                       '$view' => L10n::t('View'),
-                       '$previous' => [System::baseUrl() . "/events/$prevyear/$prevmonth", L10n::t('Previous'), '', ''],
-                       '$next' => [System::baseUrl() . "/events/$nextyear/$nextmonth", L10n::t('Next'), '', ''],
+                       '$title' => DI::l10n()->t('Events'),
+                       '$view' => DI::l10n()->t('View'),
+                       '$previous' => [DI::baseUrl() . "/events/$prevyear/$prevmonth", DI::l10n()->t('Previous'), '', ''],
+                       '$next' => [DI::baseUrl() . "/events/$nextyear/$nextmonth", DI::l10n()->t('Next'), '', ''],
                        '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
                        '$events' => $events,
-                       "today" => L10n::t("today"),
-                       "month" => L10n::t("month"),
-                       "week" => L10n::t("week"),
-                       "day" => L10n::t("day"),
-                       "list" => L10n::t("list"),
+                       "today" => DI::l10n()->t("today"),
+                       "month" => DI::l10n()->t("month"),
+                       "week" => DI::l10n()->t("week"),
+                       "day" => DI::l10n()->t("day"),
+                       "list" => DI::l10n()->t("list"),
                ]);
 
                if (!empty($_GET['id'])) {
@@ -280,14 +279,14 @@ function cal_content(App $a)
 
        if ($mode == 'export') {
                if (!$owner_uid) {
-                       notice(L10n::t('User not found'));
+                       notice(DI::l10n()->t('User not found'));
                        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(L10n::t('Permission denied.') . EOL);
+                       notice(DI::l10n()->t('Permission denied.') . EOL);
                        DI::baseUrl()->redirect('cal/' . $nick);
                }
 
@@ -296,9 +295,9 @@ function cal_content(App $a)
 
                if (!$evexport["success"]) {
                        if ($evexport["content"]) {
-                               notice(L10n::t('This calendar format is not supported'));
+                               notice(DI::l10n()->t('This calendar format is not supported'));
                        } else {
-                               notice(L10n::t('No exportable data found'));
+                               notice(DI::l10n()->t('No exportable data found'));
                        }
 
                        // If it the own calendar return to the events page
@@ -315,7 +314,7 @@ function cal_content(App $a)
                // If nothing went wrong we can echo the export content
                if ($evexport["success"]) {
                        header('Content-type: text/calendar');
-                       header('content-disposition: attachment; filename="' . L10n::t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
+                       header('content-disposition: attachment; filename="' . DI::l10n()->t('calendar') . '-' . $nick . '.' . $evexport["extension"] . '"');
                        echo $evexport["content"];
                        exit();
                }