Merge remote-tracking branch 'upstream/develop' into item-notification

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index ddcac1bd154f0939980d306d709b4e65516b4d9e..d6701ce44879f33efb7ce58ce0175f5bc541a11d 100644 (file)
--- a/mod/events.php
+++ b/mod/events.php
@@ -11,7 +11,6 @@ use Friendica\Core\ACL;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
@@ -19,9 +18,7 @@ use Friendica\DI;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
-use Friendica\Module\Login;
 use Friendica\Module\Security\Login;
-use Friendica\Util\ACLFormatter;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 use Friendica\Util\Temporal;
@@ -39,13 +36,13 @@ function events_init(App $a)
                return;
        }
 
-       if (empty($a->page['aside'])) {
-               $a->page['aside'] = '';
+       if (empty(DI::page()['aside'])) {
+               DI::page()['aside'] = '';
        }
 
        $cal_widget = CalendarExport::getHTML();
 
-       $a->page['aside'] .= $cal_widget;
+       DI::page()['aside'] .= $cal_widget;
 
        return;
 }
@@ -217,7 +214,7 @@ function events_content(App $a)
        }
 
        if ($a->argc == 1) {
-               $_SESSION['return_path'] = $a->cmd;
+               $_SESSION['return_path'] = DI::args()->getCommand();
        }
 
        if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
@@ -244,7 +241,7 @@ function events_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' => '/events',
                '$modparams' => 1,
                '$i18n' => $i18n,
@@ -350,7 +347,7 @@ function events_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;
                                }
                        }
                }
@@ -386,18 +383,18 @@ function events_content(App $a)
                }
 
                // ACL blocks are loaded in modals in frio
-               $a->page->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
-               $a->page->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
-               $a->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
-               $a->page->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
+               DI::page()->registerFooterScript(Theme::getPathForFile('asset/typeahead.js/dist/typeahead.bundle.js'));
+               DI::page()->registerFooterScript(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.js'));
+               DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput.css'));
+               DI::page()->registerStylesheet(Theme::getPathForFile('js/friendica-tagsinput/friendica-tagsinput-typeahead.css'));
 
                $o = Renderer::replaceMacros($tpl, [
                        '$tabs'      => $tabs,
                        '$title'     => L10n::t('Events'),
                        '$view'      => L10n::t('View'),
-                       '$new_event' => [System::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''],
-                       '$previous'  => [System::baseUrl() . '/events/$prevyear/$prevmonth', L10n::t('Previous'), '', ''],
-                       '$next'      => [System::baseUrl() . '/events/$nextyear/$nextmonth', L10n::t('Next'), '', ''],
+                       '$new_event' => [DI::baseUrl() . '/events/new', L10n::t('Create New Event'), '', ''],
+                       '$previous'  => [DI::baseUrl() . '/events/$prevyear/$prevmonth', L10n::t('Previous'), '', ''],
+                       '$next'      => [DI::baseUrl() . '/events/$nextyear/$nextmonth', L10n::t('Next'), '', ''],
                        '$calendar'  => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
 
                        '$events'    => $events,
@@ -491,7 +488,7 @@ function events_content(App $a)
                $fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
 
                if (!$cid && in_array($mode, ['new', 'copy'])) {
-                       $acl = ACL::getFullSelectorHTML($a->page, $a->user, false, ACL::getDefaultUserPermissions($orig_event));
+                       $acl = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($orig_event));
                } else {
                        $acl = '';
                }
@@ -506,7 +503,7 @@ function events_content(App $a)
                $tpl = Renderer::getMarkupTemplate('event_form.tpl');
 
                $o .= Renderer::replaceMacros($tpl, [
-                       '$post' => System::baseUrl() . '/events',
+                       '$post' => DI::baseUrl() . '/events',
                        '$eid'  => $eid,
                        '$cid'  => $cid,
                        '$uri'  => $uri,