X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fevents.php;h=695dbb290fa7cab17129f676d9133d391059427b;hb=f58d8f410885bb1895821cd0767bdf981629f0cd;hp=876727608d033937ea542cefcd79570b3188d11b;hpb=fa3fa42d966e00534aa6cbf33d60ef438a8e3b97;p=friendica.git
diff --git a/mod/events.php b/mod/events.php
index 876727608d..695dbb290f 100644
--- a/mod/events.php
+++ b/mod/events.php
@@ -5,9 +5,16 @@
*/
use Friendica\App;
+use Friendica\Content\Nav;
+use Friendica\Core\L10n;
+use Friendica\Core\System;
+use Friendica\Core\Worker;
+use Friendica\Database\DBM;
+use Friendica\Model\Item;
+use Friendica\Model\Profile;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Temporal;
-require_once 'include/bbcode.php';
-require_once 'include/datetime.php';
require_once 'include/event.php';
require_once 'include/items.php';
@@ -16,7 +23,7 @@ function events_init(App $a) {
return;
}
- if ($a->argc == 1) {
+ if ($a->argc > 1) {
// If it's a json request abort here because we don't
// need the widget data
if ($a->argv[1] === 'json') {
@@ -68,14 +75,14 @@ function events_post(App $a) {
}
if ($adjust) {
- $start = datetime_convert(date_default_timezone_get(), 'UTC', $start);
+ $start = DateTimeFormat::convert($start, 'UTC', date_default_timezone_get());
if (! $nofinish) {
- $finish = datetime_convert(date_default_timezone_get(), 'UTC', $finish);
+ $finish = DateTimeFormat::convert($finish, 'UTC', date_default_timezone_get());
}
} else {
- $start = datetime_convert('UTC', 'UTC', $start);
+ $start = DateTimeFormat::utc($start);
if (! $nofinish) {
- $finish = datetime_convert('UTC', 'UTC', $finish);
+ $finish = DateTimeFormat::utc($finish);
}
}
@@ -90,21 +97,21 @@ function events_post(App $a) {
$type = 'event';
$action = ($event_id == '') ? 'new' : "event/" . $event_id;
- $onerror_url = App::get_baseurl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
+ $onerror_url = System::baseUrl() . "/events/" . $action . "?summary=$summary&description=$desc&location=$location&start=$start_text&finish=$finish_text&adjust=$adjust&nofinish=$nofinish";
if (strcmp($finish, $start) < 0 && !$nofinish) {
- notice(t('Event can not end before it has started.') . EOL);
+ notice(L10n::t('Event can not end before it has started.') . EOL);
if (intval($_REQUEST['preview'])) {
- echo t('Event can not end before it has started.');
+ echo L10n::t('Event can not end before it has started.');
killme();
}
goaway($onerror_url);
}
if ((! $summary) || ($start === NULL_DATE)) {
- notice(t('Event title and start time are required.') . EOL);
+ notice(L10n::t('Event title and start time are required.') . EOL);
if (intval($_REQUEST['preview'])) {
- echo t('Event title and start time are required.');
+ echo L10n::t('Event title and start time are required.');
killme();
}
goaway($onerror_url);
@@ -146,7 +153,7 @@ function events_post(App $a) {
}
- $datarray = array();
+ $datarray = [];
$datarray['guid'] = get_guid(32);
$datarray['start'] = $start;
$datarray['finish'] = $finish;
@@ -176,7 +183,7 @@ function events_post(App $a) {
$item_id = event_store($datarray);
if (! $cid) {
- proc_run(PRIORITY_HIGH, "include/notifier.php", "event", $item_id);
+ Worker::add(PRIORITY_HIGH, "Notifier", "event", $item_id);
}
goaway($_SESSION['return_url']);
@@ -185,12 +192,12 @@ function events_post(App $a) {
function events_content(App $a) {
if (! local_user()) {
- notice(t('Permission denied.') . EOL);
+ notice(L10n::t('Permission denied.') . EOL);
return;
}
if ($a->argc == 1) {
- $_SESSION['return_url'] = App::get_baseurl() . '/' . $a->cmd;
+ $_SESSION['return_url'] = System::baseUrl() . '/' . $a->cmd;
}
if (($a->argc > 2) && ($a->argv[1] === 'ignore') && intval($a->argv[2])) {
@@ -208,31 +215,32 @@ function events_content(App $a) {
}
if ($a->theme_events_in_profile) {
- nav_set_selected('home');
+ Nav::setSelected('home');
} else {
- nav_set_selected('events');
+ Nav::setSelected('events');
}
// get the translation strings for the callendar
$i18n = get_event_strings();
$htpl = get_markup_template('event_head.tpl');
- $a->page['htmlhead'] .= replace_macros($htpl, array(
- '$baseurl' => App::get_baseurl(),
+ $a->page['htmlhead'] .= replace_macros($htpl, [
+ '$baseurl' => System::baseUrl(),
'$module_url' => '/events',
'$modparams' => 1,
'$i18n' => $i18n,
- ));
+ ]);
$etpl = get_markup_template('event_end.tpl');
- $a->page['end'] .= replace_macros($etpl, array(
- '$baseurl' => App::get_baseurl(),
- ));
+ $a->page['end'] .= replace_macros($etpl, [
+ '$baseurl' => System::baseUrl(),
+ ]);
$o = '';
+ $tabs = '';
// tabs
if ($a->theme_events_in_profile) {
- $tabs = profile_tabs($a, true);
+ $tabs = Profile::getTabs($a, true);
}
$mode = 'view';
@@ -249,6 +257,10 @@ function events_content(App $a) {
$mode = 'drop';
$event_id = intval($a->argv[2]);
}
+ if ($a->argc > 2 && $a->argv[1] == 'copy') {
+ $mode = 'copy';
+ $event_id = intval($a->argv[2]);
+ }
if ($a->argv[1] === 'new') {
$mode = 'new';
$event_id = 0;
@@ -263,8 +275,8 @@ function events_content(App $a) {
// The view mode part is similiar to /mod/cal.php
if ($mode == 'view') {
- $thisyear = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y');
- $thismonth = datetime_convert('UTC', date_default_timezone_get(), 'now', 'm');
+ $thisyear = DateTimeFormat::localNow('Y');
+ $thismonth = DateTimeFormat::localNow('m');
if (! $y) {
$y = intval($thisyear);
}
@@ -297,31 +309,34 @@ function events_content(App $a) {
$prevyear --;
}
- $dim = get_dim($y, $m);
+ $dim = Temporal::getDaysInMonth($y, $m);
$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->argv[1] === 'json') {
- if (x($_GET, 'start')) {$start = $_GET['start'];}
- if (x($_GET, 'end')) {$finish = $_GET['end'];}
+ if ($a->argc > 1 && $a->argv[1] === 'json') {
+ if (x($_GET, 'start')) {
+ $start = $_GET['start'];
+ }
+ if (x($_GET, 'end')) {
+ $finish = $_GET['end'];
+ }
}
- $start = datetime_convert('UTC', 'UTC', $start);
- $finish = datetime_convert('UTC', 'UTC', $finish);
+ $start = DateTimeFormat::utc($start);
+ $finish = DateTimeFormat::utc($finish);
- $adjust_start = datetime_convert('UTC', date_default_timezone_get(), $start);
- $adjust_finish = datetime_convert('UTC', date_default_timezone_get(), $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 = array(
+ $event_params = [
'event_id' => (x($_GET, 'id') ? $_GET['id'] : 0),
'start' => $start,
'finish' => $finish,
'adjust_start' => $adjust_start,
'adjust_finish' => $adjust_finish,
'ignored' => $ignored,
- );
+ ];
// get events by id or by date
if (x($_GET, 'id')) {
@@ -330,27 +345,27 @@ function events_content(App $a) {
$r = events_by_date(local_user(), $event_params);
}
- $links = array();
+ $links = [];
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$r = sort_by_date($r);
foreach ($r as $rr) {
- $j = (($rr['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $rr['start'], 'j') : datetime_convert('UTC', 'UTC', $rr['start'], 'j'));
+ $j = $rr['adjust'] ? DateTimeFormat::local($rr['start'], 'j') : DateTimeFormat::utc($rr['start'], 'j');
if (! x($links,$j)) {
- $links[$j] = App::get_baseurl() . '/' . $a->cmd . '#link-' . $j;
+ $links[$j] = System::baseUrl() . '/' . $a->cmd . '#link-' . $j;
}
}
}
- $events = array();
+ $events = [];
// transform the event in a usable array
- if (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$r = sort_by_date($r);
$events = process_events($r);
}
- if ($a->argv[1] === 'json'){
+ if ($a->argc > 1 && $a->argv[1] === 'json'){
echo json_encode($events);
killme();
}
@@ -363,7 +378,7 @@ function events_content(App $a) {
// Get rid of dashes in key names, Smarty3 can't handle them
foreach ($events as $key => $event) {
- $event_item = array();
+ $event_item = [];
foreach ($event['item'] as $k => $v) {
$k = str_replace('-' ,'_', $k);
$event_item[$k] = $v;
@@ -371,24 +386,24 @@ function events_content(App $a) {
$events[$key]['item'] = $event_item;
}
- $o = replace_macros($tpl, array(
- '$baseurl' => App::get_baseurl(),
+ $o = replace_macros($tpl, [
+ '$baseurl' => System::baseUrl(),
'$tabs' => $tabs,
- '$title' => t('Events'),
- '$view' => t('View'),
- '$new_event' => array(App::get_baseurl() . '/events/new', t('Create New Event'), '', ''),
- '$previous' => array(App::get_baseurl() . '/events/$prevyear/$prevmonth', t('Previous'), '', ''),
- '$next' => array(App::get_baseurl() . '/events/$nextyear/$nextmonth', t('Next'), '', ''),
- '$calendar' => cal($y, $m, $links, ' eventcal'),
+ '$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'), '', ''],
+ '$calendar' => Temporal::getCalendarTable($y, $m, $links, ' eventcal'),
'$events' => $events,
- '$today' => t('today'),
- '$month' => t('month'),
- '$week' => t('week'),
- '$day' => t('day'),
- '$list' => t('list'),
- ));
+ '$today' => L10n::t('today'),
+ '$month' => L10n::t('month'),
+ '$week' => L10n::t('week'),
+ '$day' => L10n::t('day'),
+ '$list' => L10n::t('list'),
+ ]);
if (x($_GET, 'id')) {
echo $o;
@@ -398,19 +413,19 @@ function events_content(App $a) {
return $o;
}
- if ($mode === 'edit' && $event_id) {
+ 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 (dbm::is_result($r)) {
+ if (DBM::is_result($r)) {
$orig_event = $r[0];
}
}
// Passed parameters overrides anything found in the DB
- if ($mode === 'edit' || $mode === 'new') {
- if (!x($orig_event)) {$orig_event = array();}
+ if (in_array($mode, ['edit', 'new', 'copy'])) {
+ if (!x($orig_event)) {$orig_event = [];}
// In case of an error the browser is redirected back here, with these parameters filled in with the previous values
if (x($_REQUEST, 'nofinish')) {$orig_event['nofinish'] = $_REQUEST['nofinish'];}
if (x($_REQUEST, 'adjust')) {$orig_event['adjust'] = $_REQUEST['adjust'];}
@@ -430,17 +445,18 @@ function events_content(App $a) {
$cid = ((x($orig_event)) ? $orig_event['cid'] : 0);
$uri = ((x($orig_event)) ? $orig_event['uri'] : '');
- if (! x($orig_event)) {
- $sh_checked = '';
- } else {
+ $sh_disabled = '';
+ $sh_checked = '';
+
+ if (x($orig_event)) {
$sh_checked = (($orig_event['allow_cid'] === '<' . local_user() . '>' && (! $orig_event['allow_gid']) && (! $orig_event['deny_cid']) && (! $orig_event['deny_gid'])) ? '' : ' checked="checked" ');
}
- if ($cid OR ($mode !== 'new')) {
- $sh_checked .= ' disabled="disabled" ';
+ if ($cid || $mode === 'edit') {
+ $sh_disabled = 'disabled="disabled"';
}
- $sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
+ $sdt = ((x($orig_event)) ? $orig_event['start'] : 'now');
$fdt = ((x($orig_event)) ? $orig_event['finish'] : 'now');
$tz = date_default_timezone_get();
@@ -448,69 +464,78 @@ function events_content(App $a) {
$tz = (($orig_event['adjust']) ? date_default_timezone_get() : 'UTC');
}
- $syear = datetime_convert('UTC', $tz, $sdt, 'Y');
- $smonth = datetime_convert('UTC', $tz, $sdt, 'm');
- $sday = datetime_convert('UTC', $tz, $sdt, 'd');
-
- $shour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'H') : 0);
- $sminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $sdt, 'i') : 0);
+ $syear = DateTimeFormat::convert($sdt, $tz, 'UTC', 'Y');
+ $smonth = DateTimeFormat::convert($sdt, $tz, 'UTC', 'm');
+ $sday = DateTimeFormat::convert($sdt, $tz, 'UTC', 'd');
- $fyear = datetime_convert('UTC', $tz, $fdt, 'Y');
- $fmonth = datetime_convert('UTC', $tz, $fdt, 'm');
- $fday = datetime_convert('UTC', $tz, $fdt, 'd');
+ $shour = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'H') : '00');
+ $sminute = ((x($orig_event)) ? DateTimeFormat::convert($sdt, $tz, 'UTC', 'i') : '00');
- $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
- $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
+ $fyear = DateTimeFormat::convert($fdt, $tz, 'UTC', 'Y');
+ $fmonth = DateTimeFormat::convert($fdt, $tz, 'UTC', 'm');
+ $fday = DateTimeFormat::convert($fdt, $tz, 'UTC', 'd');
- $f = get_config('system','event_input_format');
- if (! $f) {
- $f = 'ymd';
- }
+ $fhour = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'H') : '00');
+ $fminute = ((x($orig_event)) ? DateTimeFormat::convert($fdt, $tz, 'UTC', 'i') : '00');
require_once 'include/acl_selectors.php' ;
- if ($mode === 'new') {
+ $perms = get_acl_permissions($orig_event);
+
+ if ($mode === 'new' || $mode === 'copy') {
$acl = (($cid) ? '' : populate_acl(((x($orig_event)) ? $orig_event : $a->user)));
}
+ // If we copy an old event, we need to remove the ID and URI
+ // from the original event.
+ if ($mode === 'copy') {
+ $eid = 0;
+ $uri = '';
+ }
+
$tpl = get_markup_template('event_form.tpl');
- $o .= replace_macros($tpl,array(
- '$post' => App::get_baseurl() . '/events',
- '$eid' => $eid,
- '$cid' => $cid,
- '$uri' => $uri,
-
- '$title' => t('Event details'),
- '$desc' => t('Starting date and Title are required.'),
- '$s_text' => t('Event Starts:') . ' *',
- '$s_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), t('Event Starts:'), 'start_text', true, true, '', '', true),
- '$n_text' => t('Finish date/time is not known or not relevant'),
+ $o .= replace_macros($tpl,[
+ '$post' => System::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:') . ' *',
+ '$s_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $syear+5), DateTime::createFromFormat('Y-m-d H:i', "$syear-$smonth-$sday $shour:$sminute"), L10n::t('Event Starts:'), 'start_text', true, true, '', '', true),
+ '$n_text' => L10n::t('Finish date/time is not known or not relevant'),
'$n_checked' => $n_checked,
- '$f_text' => t('Event Finishes:'),
- '$f_dsel' => datetimesel($f, new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
- '$a_text' => t('Adjust for viewer timezone'),
+ '$f_text' => L10n::t('Event Finishes:'),
+ '$f_dsel' => Temporal::getDateTimeField(new DateTime(), DateTime::createFromFormat('Y', $fyear+5), DateTime::createFromFormat('Y-m-d H:i', "$fyear-$fmonth-$fday $fhour:$fminute"), L10n::t('Event Finishes:'), 'finish_text', true, true, 'start_text'),
+ '$a_text' => L10n::t('Adjust for viewer timezone'),
'$a_checked' => $a_checked,
- '$d_text' => t('Description:'),
+ '$d_text' => L10n::t('Description:'),
'$d_orig' => $d_orig,
- '$l_text' => t('Location:'),
+ '$l_text' => L10n::t('Location:'),
'$l_orig' => $l_orig,
- '$t_text' => t('Title:') . ' *',
+ '$t_text' => L10n::t('Title:') . ' *',
'$t_orig' => $t_orig,
- '$summary' => array('summary', t('Title:'), $t_orig, '', '*'),
- '$sh_text' => t('Share this event'),
- '$share' => array('share', t('Share this event'), $sh_checked, ''),
+ '$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' => array('nofinish', t('Finish date/time is not known or not relevant'), $n_checked),
- '$adjust' => array('adjust', t('Adjust for viewer timezone'), $a_checked),
- '$preview' => t('Preview'),
+ '$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'),
'$acl' => $acl,
- '$submit' => t('Submit'),
- '$basic' => t('Basic'),
- '$advanced' => t('Advanced'),
- '$permissions' => t('Permissions'),
+ '$submit' => L10n::t('Submit'),
+ '$basic' => L10n::t('Basic'),
+ '$advanced' => L10n::t('Advanced'),
+ '$permissions' => L10n::t('Permissions'),
- ));
+ ]);
return $o;
}
@@ -519,20 +544,20 @@ function events_content(App $a) {
if ($mode === 'drop' && $event_id) {
$del = 0;
- $params = array('event_id' => ($event_id));
+ $params = ['event_id' => ($event_id)];
$ev = event_by_id(local_user(), $params);
// Delete only real events (no birthdays)
- if (dbm::is_result($ev) && $ev[0]['type'] == 'event') {
- $del = drop_item($ev[0]['itemid'], false);
+ if (DBM::is_result($ev) && $ev[0]['type'] == 'event') {
+ $del = Item::deleteById($ev[0]['itemid']);
}
if ($del == 0) {
- notice(t('Failed to remove event' ) . EOL);
+ notice(L10n::t('Failed to remove event') . EOL);
} else {
- info(t('Event removed') . EOL);
+ info(L10n::t('Event removed') . EOL);
}
- goaway(App::get_baseurl() . '/events');
+ goaway(System::baseUrl() . '/events');
}
}