X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=ffe67f67fededc099898f0157159120936157d80;hb=7072e213444a8a23da83b16cfeba37c807a54674;hp=d1d3d758b45955e98b6ac31f62a31f589c665748;hpb=e56c8dcc3cc6813a56aac2a0eed0157b0f534ab6;p=friendica.git
diff --git a/mod/events.php b/mod/events.php
index d1d3d758b4..ffe67f67fe 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -1,14 +1,13 @@
t('Event can not end before it has started.') . EOL);
if (intval($_REQUEST['preview'])) {
- echo L10n::t('Event can not end before it has started.');
+ echo DI::l10n()->t('Event can not end before it has started.');
exit();
}
DI::baseUrl()->redirect($onerror_path);
}
if (!$summary || ($start === DBA::NULL_DATETIME)) {
- notice(L10n::t('Event title and start time are required.') . EOL);
+ notice(DI::l10n()->t('Event title and start time are required.') . EOL);
if (intval($_REQUEST['preview'])) {
- echo L10n::t('Event title and start time are required.');
+ echo DI::l10n()->t('Event title and start time are required.');
exit();
}
DI::baseUrl()->redirect($onerror_path);
@@ -210,7 +209,7 @@ function events_post(App $a)
function events_content(App $a)
{
if (!local_user()) {
- notice(L10n::t('Permission denied.') . EOL);
+ notice(DI::l10n()->t('Permission denied.') . EOL);
return Login::form();
}
@@ -252,7 +251,7 @@ function events_content(App $a)
$tabs = '';
// tabs
if ($a->theme_events_in_profile) {
- $tabs = Profile::getTabs($a, 'events', true);
+ $tabs = BaseProfile::getTabsHTML($a, 'events', true);
}
$mode = 'view';
@@ -391,20 +390,20 @@ function events_content(App $a)
$o = Renderer::replaceMacros($tpl, [
'$tabs' => $tabs,
- '$title' => L10n::t('Events'),
- '$view' => L10n::t('View'),
- '$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'), '', ''],
+ '$title' => DI::l10n()->t('Events'),
+ '$view' => DI::l10n()->t('View'),
+ '$new_event' => [DI::baseUrl() . '/events/new', DI::l10n()->t('Create New Event'), '', ''],
+ '$previous' => [DI::baseUrl() . '/events/$prevyear/$prevmonth', DI::l10n()->t('Previous'), '', ''],
+ '$next' => [DI::baseUrl() . '/events/$nextyear/$nextmonth', DI::l10n()->t('Next'), '', ''],
'$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
'$events' => $events,
- '$today' => L10n::t('today'),
- '$month' => L10n::t('month'),
- '$week' => L10n::t('week'),
- '$day' => L10n::t('day'),
- '$list' => L10n::t('list'),
+ '$today' => DI::l10n()->t('today'),
+ '$month' => DI::l10n()->t('month'),
+ '$week' => DI::l10n()->t('week'),
+ '$day' => DI::l10n()->t('day'),
+ '$list' => DI::l10n()->t('list'),
]);
if (!empty($_GET['id'])) {
@@ -427,8 +426,16 @@ function events_content(App $a)
// Passed parameters overrides anything found in the DB
if (in_array($mode, ['edit', 'new', 'copy'])) {
+ $share_checked = '';
+ $share_disabled = '';
+
if (empty($orig_event)) {
$orig_event = User::getById(local_user(), ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);;
+ } elseif ($orig_event['allow_cid'] !== '<' . local_user() . '>'
+ || $orig_event['allow_gid']
+ || $orig_event['deny_cid']
+ || $orig_event['deny_gid']) {
+ $share_checked = ' checked="checked" ';
}
// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
@@ -450,20 +457,8 @@ function events_content(App $a)
$cid = !empty($orig_event) ? $orig_event['cid'] : 0;
$uri = !empty($orig_event) ? $orig_event['uri'] : '';
- $sh_disabled = '';
- $sh_checked = '';
-
- if (!empty($orig_event)
- && ($orig_event['allow_cid'] !== '<' . local_user() . '>'
- || $orig_event['allow_gid']
- || $orig_event['deny_cid']
- || $orig_event['deny_gid']))
- {
- $sh_checked = ' checked="checked" ';
- }
-
if ($cid || $mode === 'edit') {
- $sh_disabled = 'disabled="disabled"';
+ $share_disabled = 'disabled="disabled"';
}
$sdt = !empty($orig_event) ? $orig_event['start'] : 'now';
@@ -509,14 +504,14 @@ function events_content(App $a)
'$cid' => $cid,
'$uri' => $uri,
- '$title' => L10n::t('Event details'),
- '$desc' => L10n::t('Starting date and Title are required.'),
- '$s_text' => L10n::t('Event Starts:') . ' *',
+ '$title' => DI::l10n()->t('Event details'),
+ '$desc' => DI::l10n()->t('Starting date and Title are required.'),
+ '$s_text' => DI::l10n()->t('Event Starts:') . ' *',
'$s_dsel' => Temporal::getDateTimeField(
new DateTime(),
DateTime::createFromFormat('Y', intval($syear) + 5),
DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"),
- L10n::t('Event Starts:'),
+ DI::l10n()->t('Event Starts:'),
'start_text',
true,
true,
@@ -524,39 +519,39 @@ function events_content(App $a)
'',
true
),
- '$n_text' => L10n::t('Finish date/time is not known or not relevant'),
+ '$n_text' => DI::l10n()->t('Finish date/time is not known or not relevant'),
'$n_checked' => $n_checked,
- '$f_text' => L10n::t('Event Finishes:'),
+ '$f_text' => DI::l10n()->t('Event Finishes:'),
'$f_dsel' => Temporal::getDateTimeField(
new DateTime(),
DateTime::createFromFormat('Y', intval($fyear) + 5),
DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"),
- L10n::t('Event Finishes:'),
+ DI::l10n()->t('Event Finishes:'),
'finish_text',
true,
true,
'start_text'
),
- '$a_text' => L10n::t('Adjust for viewer timezone'),
+ '$a_text' => DI::l10n()->t('Adjust for viewer timezone'),
'$a_checked' => $a_checked,
- '$d_text' => L10n::t('Description:'),
+ '$d_text' => DI::l10n()->t('Description:'),
'$d_orig' => $d_orig,
- '$l_text' => L10n::t('Location:'),
+ '$l_text' => DI::l10n()->t('Location:'),
'$l_orig' => $l_orig,
- '$t_text' => L10n::t('Title:') . ' *',
+ '$t_text' => DI::l10n()->t('Title:') . ' *',
'$t_orig' => $t_orig,
- '$summary' => ['summary', L10n::t('Title:'), $t_orig, '', '*'],
- '$sh_text' => L10n::t('Share this event'),
- '$share' => ['share', L10n::t('Share this event'), $sh_checked, '', $sh_disabled],
- '$sh_checked' => $sh_checked,
- '$nofinish' => ['nofinish', L10n::t('Finish date/time is not known or not relevant'), $n_checked],
- '$adjust' => ['adjust', L10n::t('Adjust for viewer timezone'), $a_checked],
- '$preview' => L10n::t('Preview'),
+ '$summary' => ['summary', DI::l10n()->t('Title:'), $t_orig, '', '*'],
+ '$sh_text' => DI::l10n()->t('Share this event'),
+ '$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' => L10n::t('Submit'),
- '$basic' => L10n::t('Basic'),
- '$advanced' => L10n::t('Advanced'),
- '$permissions' => L10n::t('Permissions'),
+ '$submit' => DI::l10n()->t('Submit'),
+ '$basic' => DI::l10n()->t('Basic'),
+ '$advanced' => DI::l10n()->t('Advanced'),
+ '$permissions' => DI::l10n()->t('Permissions'),
]);
return $o;
@@ -572,9 +567,9 @@ function events_content(App $a)
}
if (Item::exists(['id' => $ev[0]['itemid']])) {
- notice(L10n::t('Failed to remove event') . EOL);
+ notice(DI::l10n()->t('Failed to remove event') . EOL);
} else {
- info(L10n::t('Event removed') . EOL);
+ info(DI::l10n()->t('Event removed') . EOL);
}
DI::baseUrl()->redirect('events');