<?php
/**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
return;
}
- // If it's a json request abort here because we don't
- // need the widget data
- if ($a->argc > 1 && $a->argv[1] === 'json') {
- return;
- }
-
if (empty(DI::page()['aside'])) {
DI::page()['aside'] = '';
}
- $cal_widget = CalendarExport::getHTML();
+ $cal_widget = CalendarExport::getHTML(local_user());
DI::page()['aside'] .= $cal_widget;
$start_text = Strings::escapeHtml($_REQUEST['start_text'] ?? '');
$finish_text = Strings::escapeHtml($_REQUEST['finish_text'] ?? '');
- $adjust = intval($_POST['adjust'] ?? 0);
$nofinish = intval($_POST['nofinish'] ?? 0);
$share = intval($_POST['share'] ?? 0);
$finish = $finish_text;
}
- if ($adjust) {
- $start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
- if (!$nofinish) {
- $finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
- }
- } else {
- $start = DateTimeFormat::utc($start);
- if (!$nofinish) {
- $finish = DateTimeFormat::utc($finish);
- }
+ $start = DateTimeFormat::convert($start, 'UTC', $a->getTimeZone());
+ if (!$nofinish) {
+ $finish = DateTimeFormat::convert($finish, 'UTC', $a->getTimeZone());
}
// Don't allow the event to finish before it begins.
'location' => $location,
'start' => $start_text,
'finish' => $finish_text,
- 'adjust' => $adjust,
'nofinish' => $nofinish,
];
$datarray['desc'] = $desc;
$datarray['location'] = $location;
$datarray['type'] = $type;
- $datarray['adjust'] = $adjust;
$datarray['nofinish'] = $nofinish;
$datarray['uid'] = $uid;
$datarray['cid'] = $cid;
$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);
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');
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');
$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';
$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]);
}
}
$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 (!empty($_GET['start'])) {
- $start = $_GET['start'];
- }
- if (!empty($_GET['end'])) {
- $finish = $_GET['end'];
- }
- }
-
- $start = DateTimeFormat::utc($start);
- $finish = DateTimeFormat::utc($finish);
-
- $adjust_start = DateTimeFormat::local($start);
- $adjust_finish = DateTimeFormat::local($finish);
-
// put the event parametes in an array so we can better transmit them
$event_params = [
'event_id' => intval($_GET['id'] ?? 0),
'start' => $start,
'finish' => $finish,
- 'adjust_start' => $adjust_start,
- 'adjust_finish' => $adjust_finish,
'ignore' => $ignored,
];
if (DBA::isResult($r)) {
$r = Event::sortByDate($r);
foreach ($r as $rr) {
- $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
+ $j = DateTimeFormat::local($rr['start'], 'j');
if (empty($links[$j])) {
$links[$j] = DI::baseUrl() . '/' . DI::args()->getCommand() . '#link-' . $j;
}
$events = Event::prepareListForTemplate($r);
}
- if ($a->argc > 1 && $a->argv[1] === 'json') {
- header('Content-Type: application/json');
- echo json_encode($events);
- exit();
- }
-
if (!empty($_GET['id'])) {
$tpl = Renderer::getMarkupTemplate("event.tpl");
} else {
}
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
// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
if (!empty($_REQUEST['nofinish'])) {$orig_event['nofinish'] = $_REQUEST['nofinish'];}
- if (!empty($_REQUEST['adjust'])) {$orig_event['adjust'] = $_REQUEST['adjust'];}
if (!empty($_REQUEST['summary'])) {$orig_event['summary'] = $_REQUEST['summary'];}
if (!empty($_REQUEST['desc'])) {$orig_event['desc'] = $_REQUEST['desc'];}
if (!empty($_REQUEST['location'])) {$orig_event['location'] = $_REQUEST['location'];}
if (!empty($_REQUEST['finish'])) {$orig_event['finish'] = $_REQUEST['finish'];}
$n_checked = (!empty($orig_event['nofinish']) ? ' checked="checked" ' : '');
- $a_checked = (!empty($orig_event['adjust']) ? ' checked="checked" ' : '');
$t_orig = $orig_event['summary'] ?? '';
$d_orig = $orig_event['desc'] ?? '';
$sdt = $orig_event['start'] ?? 'now';
$fdt = $orig_event['finish'] ?? 'now';
- $tz = date_default_timezone_get();
- if (!empty($orig_event)) {
- $tz = ($orig_event['adjust'] ? date_default_timezone_get() : 'UTC');
- }
-
- $syear = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
- $smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
- $sday = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
+ $syear = DateTimeFormat::local($sdt, 'Y');
+ $smonth = DateTimeFormat::local($sdt, 'm');
+ $sday = DateTimeFormat::local($sdt, 'd');
- $shour = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00';
- $sminute = !empty($orig_event) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00';
+ $shour = !empty($orig_event) ? DateTimeFormat::local($sdt, 'H') : '00';
+ $sminute = !empty($orig_event) ? DateTimeFormat::local($sdt, 'i') : '00';
- $fyear = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
- $fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
- $fday = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
+ $fyear = DateTimeFormat::local($fdt, 'Y');
+ $fmonth = DateTimeFormat::local($fdt, 'm');
+ $fday = DateTimeFormat::local($fdt, 'd');
- $fhour = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00';
- $fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
+ $fhour = !empty($orig_event) ? DateTimeFormat::local($fdt, 'H') : '00';
+ $fminute = !empty($orig_event) ? DateTimeFormat::local($fdt, '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 = '';
}
true,
'start_text'
),
- '$a_text' => DI::l10n()->t('Adjust for viewer timezone'),
- '$a_checked' => $a_checked,
'$d_text' => DI::l10n()->t('Description:'),
'$d_orig' => $d_orig,
'$l_text' => DI::l10n()->t('Location:'),
'$share' => ['share', DI::l10n()->t('Share this event'), $share_checked, '', $share_disabled],
'$sh_checked' => $share_checked,
'$nofinish' => ['nofinish', DI::l10n()->t('Finish date/time is not known or not relevant'), $n_checked],
- '$adjust' => ['adjust', DI::l10n()->t('Adjust for viewer timezone'), $a_checked],
'$preview' => DI::l10n()->t('Preview'),
'$acl' => $acl,
'$submit' => DI::l10n()->t('Submit'),
projects / friendica.git / blobdiff