X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=ebb7d3f114649f045fd4ab3c737625644fd31345;hb=8b450be09bacada8e4ae96079065783bbdacdf5b;hp=291535df34b6d15f3bf2060a0b7e60766e1b76d9;hpb=edf9bdfa144795edb121d04eb0f40dfa6a73bea8;p=friendica.git diff --git a/mod/events.php b/mod/events.php index 291535df34..ebb7d3f114 100644 --- a/mod/events.php +++ b/mod/events.php @@ -1,6 +1,6 @@ argc > 1 && $a->argv[1] === 'json') { + if (DI::args()->getArgc() > 1 && DI::args()->getArgv()[1] === 'json') { return; } @@ -59,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; @@ -206,9 +206,6 @@ function events_post(App $a) $datarray['deny_gid'] = $str_group_deny; $datarray['private'] = $private_event; $datarray['id'] = $event_id; - $datarray['network'] = Protocol::DFRN; - $datarray['protocol'] = Conversation::PARCEL_DIRECT; - $datarray['direction'] = Conversation::PUSH; if (intval($_REQUEST['preview'])) { $html = Event::getHTML($datarray); @@ -216,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'); @@ -232,25 +237,25 @@ 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])) { + if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'ignore') && intval(DI::args()->getArgv()[2])) { q("UPDATE `event` SET `ignore` = 1 WHERE `id` = %d AND `uid` = %d", - intval($a->argv[2]), + intval(DI::args()->getArgv()[2]), intval(local_user()) ); } - if (($a->argc > 2) && ($a->argv[1] === 'unignore') && intval($a->argv[2])) { + if ((DI::args()->getArgc() > 2) && (DI::args()->getArgv()[1] === 'unignore') && intval(DI::args()->getArgv()[2])) { q("UPDATE `event` SET `ignore` = 0 WHERE `id` = %d AND `uid` = %d", - intval($a->argv[2]), + intval(DI::args()->getArgv()[2]), intval(local_user()) ); } - if ($a->theme_events_in_profile) { + if ($a->getThemeInfoValue('events_in_profile')) { Nav::setSelected('home'); } else { Nav::setSelected('events'); @@ -274,8 +279,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'; @@ -283,27 +288,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]); } } @@ -332,7 +337,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']; } @@ -384,7 +389,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(); @@ -489,7 +494,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'); } @@ -508,7 +513,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 = ''; }