Merge remote-tracking branch 'upstream/develop' into network-thread-view

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index 4fd6706bd08d83288a4966715c48050bd3719c19..89da0c2c0eb40b91bde9b7513a29890322d4a2cc 100644 (file)
--- a/mod/events.php
+++ b/mod/events.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
  *
@@ -25,14 +25,16 @@ use Friendica\Content\Nav;
 use Friendica\Content\Widget\CalendarExport;
 use Friendica\Core\ACL;
 use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
 use Friendica\Core\Renderer;
 use Friendica\Core\Theme;
 use Friendica\Core\Worker;
 use Friendica\Database\DBA;
 use Friendica\DI;
-use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
 use Friendica\Model\Event;
 use Friendica\Model\Item;
+use Friendica\Model\Post;
 use Friendica\Model\User;
 use Friendica\Module\BaseProfile;
 use Friendica\Module\Security\Login;
@@ -49,7 +51,7 @@ function events_init(App $a)
 
        // If it's a json request abort here because we don't
        // need the widget data
-       if ($a->argc > 1 && $a->argv[1] === 'json') {
+       if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] === 'json') {
                return;
        }
 
@@ -57,7 +59,7 @@ function events_init(App $a)
                DI::page()['aside'] = '';
        }
 
-       $cal_widget = CalendarExport::getHTML();
+       $cal_widget = CalendarExport::getHTML(local_user());
 
        DI::page()['aside'] .= $cal_widget;
 
@@ -211,10 +213,18 @@ function events_post(App $a)
                exit();
        }
 
-       $item_id = Event::store($datarray);
+       $event_id = Event::store($datarray);
 
-       if (!$cid) {
-               Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $item_id);
+       $item = ['network' => Protocol::DFRN, 'protocol' => Conversation::PARCEL_DIRECT, 'direction' => Conversation::PUSH];    
+       $item = Event::getItemArrayForId($event_id, $item);
+       if (Item::insert($item)) {
+               $uri_id = $item['uri-id'];
+       } else {
+               $uri_id = 0;
+       }
+
+       if (!$cid && $uri_id) {
+               Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, (int)$uri_id, (int)$uid);
        }
 
        DI::baseUrl()->redirect('events');
@@ -227,25 +237,19 @@ function events_content(App $a)
                return Login::form();
        }
 
-       if ($a->argc == 1) {
+       if (DI::args()->getArgc() == 1) {
                $_SESSION['return_path'] = DI::args()->getCommand();
        }
 
-       if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
-               q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d",
-                       intval($a->argv[2]),
-                       intval(local_user())
-               );
+       if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'ignore') && intval(DI::args()->getArgv()[2])) {
+               DBA::update('event', ['ignore' => true], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
        }
 
-       if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) {
-               q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d",
-                       intval($a->argv[2]),
-                       intval(local_user())
-               );
+       if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'unignore') && intval(DI::args()->getArgv()[2])) {
+               DBA::update('event', ['ignore' => false], ['id' => DI::args()->getArgv()[2], 'uid' => local_user()]);
        }
 
-       if ($a->theme_events_in_profile) {
+       if ($a->getThemeInfoValue('events_in_profile')) {
                Nav::setSelected('home');
        } else {
                Nav::setSelected('events');
@@ -269,8 +273,8 @@ function events_content(App $a)
        $o = '';
        $tabs = '';
        // tabs
-       if ($a->theme_events_in_profile) {
-               $tabs = BaseProfile::getTabsHTML($a, 'events', true);
+       if ($a->getThemeInfoValue('events_in_profile')) {
+               $tabs = BaseProfile::getTabsHTML($a, 'events', true, $a->getLoggedInUserNickname(), false);
        }
 
        $mode = 'view';
@@ -278,27 +282,27 @@ function events_content(App $a)
        $m = 0;
        $ignored = !empty($_REQUEST['ignored']) ? intval($_REQUEST['ignored']) : 0;
 
-       if ($a->argc > 1) {
-               if ($a->argc > 2 && $a->argv[1] == 'event') {
+       if (DI::args()->getArgc() > 1) {
+               if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'event') {
                        $mode = 'edit';
-                       $event_id = intval($a->argv[2]);
+                       $event_id = intval(DI::args()->getArgv()[2]);
                }
-               if ($a->argc > 2 && $a->argv[1] == 'drop') {
+               if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'drop') {
                        $mode = 'drop';
-                       $event_id = intval($a->argv[2]);
+                       $event_id = intval(DI::args()->getArgv()[2]);
                }
-               if ($a->argc > 2 && $a->argv[1] == 'copy') {
+               if (DI::args()->getArgc() > 2 && DI::args()->getArgv()[1] == 'copy') {
                        $mode = 'copy';
-                       $event_id = intval($a->argv[2]);
+                       $event_id = intval(DI::args()->getArgv()[2]);
                }
-               if ($a->argv[1] === 'new') {
+               if (DI::args()->getArgv()[1] === 'new') {
                        $mode = 'new';
                        $event_id = 0;
                }
-               if ($a->argc > 2 && intval($a->argv[1]) && intval($a->argv[2])) {
+               if (DI::args()->getArgc() > 2 && intval(DI::args()->getArgv()[1]) && intval(DI::args()->getArgv()[2])) {
                        $mode = 'view';
-                       $y = intval($a->argv[1]);
-                       $m = intval($a->argv[2]);
+                       $y = intval(DI::args()->getArgv()[1]);
+                       $m = intval(DI::args()->getArgv()[2]);
                }
        }
 
@@ -327,7 +331,7 @@ function events_content(App $a)
                $start  = sprintf('%d-%d-%d %d:%d:%d', $y, $m, 1, 0, 0, 0);
                $finish = sprintf('%d-%d-%d %d:%d:%d', $y, $m, $dim, 23, 59, 59);
 
-               if ($a->argc > 1 && $a->argv[1] === 'json') {
+               if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] === 'json') {
                        if (!empty($_GET['start'])) {
                                $start = $_GET['start'];
                        }
@@ -379,7 +383,7 @@ function events_content(App $a)
                        $events = Event::prepareListForTemplate($r);
                }
 
-               if ($a->argc > 1 && $a->argv[1] === 'json') {
+               if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] === 'json') {
                        header('Content-Type: application/json');
                        echo json_encode($events);
                        exit();
@@ -434,13 +438,7 @@ function events_content(App $a)
        }
 
        if (($mode === 'edit' || $mode === 'copy') && $event_id) {
-               $r = q("SELECT * FROM `event` WHERE `id` = %d AND `uid` = %d LIMIT 1",
-                       intval($event_id),
-                       intval(local_user())
-               );
-               if (DBA::isResult($r)) {
-                       $orig_event = $r[0];
-               }
+               $orig_event = DBA::selectFirst('event', [], ['id' => $event_id, 'uid' => local_user()]);
        }
 
        // Passed parameters overrides anything found in the DB
@@ -484,7 +482,7 @@ function events_content(App $a)
                $fdt = $orig_event['finish'] ?? 'now';
 
                $tz = date_default_timezone_get();
-               if (!empty($orig_event)) {
+               if (isset($orig_event['adjust'])) {
                        $tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
                }
 
@@ -503,7 +501,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(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($orig_event));
+                       $acl = ACL::getFullSelectorHTML(DI::page(), $a->getLoggedInUserId(), false, ACL::getDefaultUserPermissions($orig_event));
                } else {
                        $acl = '';
                }
@@ -585,7 +583,7 @@ function events_content(App $a)
                        Item::deleteForUser(['id' => $ev[0]['itemid']], local_user());
                }
 
-               if (Item::exists(['id' => $ev[0]['itemid']])) {
+               if (Post::exists(['id' => $ev[0]['itemid']])) {
                        notice(DI::l10n()->t('Failed to remove event'));
                }