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;
+use Friendica\DI;
use Friendica\Model\Event;
use Friendica\Model\Item;
use Friendica\Model\Profile;
-use Friendica\Module\Login;
+use Friendica\Model\User;
+use Friendica\Module\Security\Login;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
use Friendica\Util\Temporal;
+use Friendica\Worker\Delivery;
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;
}
$cid = !empty($_POST['cid']) ? intval($_POST['cid']) : 0;
$uid = local_user();
- $start_text = Strings::escapeHtml(defaults($_REQUEST, 'start_text', ''));
- $finish_text = Strings::escapeHtml(defaults($_REQUEST, 'finish_text', ''));
+ $start_text = Strings::escapeHtml($_REQUEST['start_text'] ?? '');
+ $finish_text = Strings::escapeHtml($_REQUEST['finish_text'] ?? '');
- $adjust = intval(defaults($_POST, 'adjust', 0));
- $nofinish = intval(defaults($_POST, 'nofinish', 0));
+ $adjust = intval($_POST['adjust'] ?? 0);
+ $nofinish = intval($_POST['nofinish'] ?? 0);
// The default setting for the `private` field in event_store() is false, so mirror that
$private_event = false;
// and we'll waste a bunch of time responding to it. Time that
// could've been spent doing something else.
- $summary = trim(defaults($_POST, 'summary' , ''));
- $desc = trim(defaults($_POST, 'desc' , ''));
- $location = trim(defaults($_POST, 'location', ''));
+ $summary = trim($_POST['summary'] ?? '');
+ $desc = trim($_POST['desc'] ?? '');
+ $location = trim($_POST['location'] ?? '');
$type = 'event';
$params = [
echo L10n::t('Event can not end before it has started.');
exit();
}
- $a->internalRedirect($onerror_path);
+ DI::baseUrl()->redirect($onerror_path);
}
if (!$summary || ($start === DBA::NULL_DATETIME)) {
echo L10n::t('Event title and start time are required.');
exit();
}
- $a->internalRedirect($onerror_path);
+ DI::baseUrl()->redirect($onerror_path);
}
- $share = intval(defaults($_POST, 'share', 0));
+ $share = intval($_POST['share'] ?? 0);
$c = q("SELECT `id` FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval(local_user())
if ($share) {
- $str_group_allow = perms2str(defaults($_POST, 'group_allow' , ''));
- $str_contact_allow = perms2str(defaults($_POST, 'contact_allow', ''));
- $str_group_deny = perms2str(defaults($_POST, 'group_deny' , ''));
- $str_contact_deny = perms2str(defaults($_POST, 'contact_deny' , ''));
+
+ $aclFormatter = DI::aclFormatter();
+
+ $str_group_allow = $aclFormatter->toString($_POST['group_allow'] ?? '');
+ $str_contact_allow = $aclFormatter->toString($_POST['contact_allow'] ?? '');
+ $str_group_deny = $aclFormatter->toString($_POST['group_deny'] ?? '');
+ $str_contact_deny = $aclFormatter->toString($_POST['contact_deny'] ?? '');
// Undo the pseudo-contact of self, since there are real contacts now
if (strpos($str_contact_allow, '<' . $self . '>') !== false) {
$item_id = Event::store($datarray);
if (!$cid) {
- Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", Delivery::POST, $item_id);
}
- $a->internalRedirect('events');
+ DI::baseUrl()->redirect('events');
}
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])) {
$i18n = Event::getStrings();
$htpl = Renderer::getMarkupTemplate('event_head.tpl');
- $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [
- '$baseurl' => System::baseUrl(),
+ DI::page()['htmlhead'] .= Renderer::replaceMacros($htpl, [
'$module_url' => '/events',
'$modparams' => 1,
'$i18n' => $i18n,
$tabs = '';
// tabs
if ($a->theme_events_in_profile) {
- $tabs = Profile::getTabs($a, true);
+ $tabs = Profile::getTabs($a, 'events', true);
}
$mode = 'view';
// put the event parametes in an array so we can better transmit them
$event_params = [
- 'event_id' => intval(defaults($_GET, 'id', 0)),
+ 'event_id' => intval($_GET['id'] ?? 0),
'start' => $start,
'finish' => $finish,
'adjust_start' => $adjust_start,
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;
}
}
}
$events[$key]['item'] = $event_item;
}
+ // ACL blocks are loaded in modals in frio
+ 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, [
- '$baseurl' => System::baseUrl(),
'$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,
// Passed parameters overrides anything found in the DB
if (in_array($mode, ['edit', 'new', 'copy'])) {
if (empty($orig_event)) {
- $orig_event = [];
+ $orig_event = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);;
}
// 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['description'])) {$orig_event['description'] = $_REQUEST['description'];}
+ if (!empty($_REQUEST['desc'])) {$orig_event['desc'] = $_REQUEST['desc'];}
if (!empty($_REQUEST['location'])) {$orig_event['location'] = $_REQUEST['location'];}
if (!empty($_REQUEST['start'])) {$orig_event['start'] = $_REQUEST['start'];}
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 = !empty($orig_event) ? $orig_event['summary'] : '';
- $d_orig = !empty($orig_event) ? $orig_event['desc'] : '';
- $l_orig = !empty($orig_event) ? $orig_event['location'] : '';
+ $t_orig = $orig_event['summary'] ?? '';
+ $d_orig = $orig_event['desc'] ?? '';
+ $l_orig = $orig_event['location'] ?? '';
$eid = !empty($orig_event) ? $orig_event['id'] : 0;
$cid = !empty($orig_event) ? $orig_event['cid'] : 0;
$uri = !empty($orig_event) ? $orig_event['uri'] : '';
$fhour = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00';
$fminute = !empty($orig_event) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00';
- $perms = ACL::getDefaultUserPermissions($orig_event);
-
if (!$cid && in_array($mode, ['new', 'copy'])) {
- $acl = ACL::getFullSelectorHTML($a->user, false, $orig_event);
+ $acl = ACL::getFullSelectorHTML(DI::page(), $a->user, false, ACL::getDefaultUserPermissions($orig_event));
} else {
$acl = '';
}
$tpl = Renderer::getMarkupTemplate('event_form.tpl');
$o .= Renderer::replaceMacros($tpl, [
- '$post' => System::baseUrl() . '/events',
+ '$post' => DI::baseUrl() . '/events',
'$eid' => $eid,
'$cid' => $cid,
'$uri' => $uri,
- '$allow_cid' => json_encode($perms['allow_cid']),
- '$allow_gid' => json_encode($perms['allow_gid']),
- '$deny_cid' => json_encode($perms['deny_cid']),
- '$deny_gid' => json_encode($perms['deny_gid']),
-
'$title' => L10n::t('Event details'),
'$desc' => L10n::t('Starting date and Title are required.'),
'$s_text' => L10n::t('Event Starts:') . ' <span class="required" title="' . L10n::t('Required') . '">*</span>',
info(L10n::t('Event removed') . EOL);
}
- $a->internalRedirect('events');
+ DI::baseUrl()->redirect('events');
}
}
projects / friendica.git / blobdiff