harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feature: allow event creation in other timezones than your own.

Browse Source
This commit is contained in:
zotlabs 2017-01-01 19:51:44 -08:00
parent dca4de80fd
commit b88a735e54
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Module/Events.php
View File

@ -43,6 +43,10 @@ class Events extends \Zotlabs\Web\Controller {
$adjust = intval($_POST['adjust']); $adjust = intval($_POST['adjust']);
$nofinish = intval($_POST['nofinish']); $nofinish = intval($_POST['nofinish']);
$timezone = ((x($_POST,'timezone_select')) ? notags(trim($_POST['timezone_select'])) : '');
$tz = (($timezone) ? $timezone : date_default_timezone_get());
$categories = escape_tags(trim($_POST['category'])); $categories = escape_tags(trim($_POST['category']));
// only allow editing your own events. // only allow editing your own events.
@ -71,9 +75,9 @@ class Events extends \Zotlabs\Web\Controller {
if($adjust) { if($adjust) {
$start = datetime_convert(date_default_timezone_get(),'UTC',$start); $start = datetime_convert($tz,'UTC',$start);
if(! $nofinish) if(! $nofinish)
$finish = datetime_convert(date_default_timezone_get(),'UTC',$finish); $finish = datetime_convert($tz,'UTC',$finish);
} }
else { else {
$start = datetime_convert('UTC','UTC',$start); $start = datetime_convert('UTC','UTC',$start);
@ -478,6 +482,8 @@ class Events extends \Zotlabs\Web\Controller {
'$allow_gid' => acl2json($permissions['allow_gid']), '$allow_gid' => acl2json($permissions['allow_gid']),
'$deny_cid' => acl2json($permissions['deny_cid']), '$deny_cid' => acl2json($permissions['deny_cid']),
'$deny_gid' => acl2json($permissions['deny_gid']), '$deny_gid' => acl2json($permissions['deny_gid']),
'$tz_choose' => feature_enabled(local_channel(),'event_tz_select'),
'$timezone' => array('timezone_select' , t('Timezone:'), date_default_timezone_get(), '', get_timezones()),
'$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'), '$lockstate' => (($acl->is_private()) ? 'lock' : 'unlock'),

9
include/features.php
View File

@ -157,6 +157,15 @@ function get_features($filtered = true) {
feature_level('smart_birthdays',2), feature_level('smart_birthdays',2),
], ],
[
'event_tz_select',
t('Event Timezone Selection'),
t('Allow event creation in timezones other than your own.'),
false,
get_config('feature_lock','event_tz_select'),
feature_level('event_tz_select',2),
],
[ [
'advanced_dirsearch', 'advanced_dirsearch',
t('Advanced Directory Search'), t('Advanced Directory Search'),

4
view/tpl/event_form.tpl
View File

@ -10,6 +10,10 @@
{{include file="field_input.tpl" field=$summary}} {{include file="field_input.tpl" field=$summary}}
{{if $tz_choose}}
{{include file="field_select_grouped.tpl" field=$timezone}}
{{/if}}
{{$s_dsel}} {{$s_dsel}}
{{$f_dsel}} {{$f_dsel}}