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

provide location and description information

Browse Source
This commit is contained in:
Mario Vavti 2019-04-19 19:06:01 +02:00
parent 2bd5ae3617
commit cb2d706fa1
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Zotlabs/Module/Channel_calendar.php
View File

@ -61,7 +61,6 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute); $start = sprintf('%d-%d-%d %d:%d:0',$startyear,$startmonth,$startday,$starthour,$startminute);
} }
if($finish_text) { if($finish_text) {
$finish = $finish_text; $finish = $finish_text;
} }
@ -74,6 +73,7 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
} }
if($adjust) { if($adjust) {
$start = datetime_convert($tz,'UTC',$start); $start = datetime_convert($tz,'UTC',$start);
if(! $nofinish) if(! $nofinish)
@ -85,6 +85,8 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
$finish = datetime_convert('UTC','UTC',$finish); $finish = datetime_convert('UTC','UTC',$finish);
} }
// Don't allow the event to finish before it begins. // Don't allow the event to finish before it begins.
// It won't hurt anything, but somebody will file a bug report // It won't hurt anything, but somebody will file a bug report
// and we'll waste a bunch of time responding to it. Time that // and we'll waste a bunch of time responding to it. Time that
@ -558,11 +560,15 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
'j' => $j, 'j' => $j,
'd' => $d, 'd' => $d,
'is_editable' => $edit ? true : false, 'is_editable' => $edit ? true : false,
'is_first'=>$is_first, 'is_first'=>$is_first,
'item'=>$rr, 'item'=>$rr,
'html'=>$html, 'html'=>$html,
'plink' => array($rr['plink'],t('Link to Source'),'',''), 'plink' => array($rr['plink'],t('Link to Source'),'',''),
'description' => $rr['description'],
'location' => $rr['location'],
'allow_cid' => expand_acl($rr['allow_cid']), 'allow_cid' => expand_acl($rr['allow_cid']),
'allow_gid' => expand_acl($rr['allow_gid']), 'allow_gid' => expand_acl($rr['allow_gid']),
'deny_cid' => expand_acl($rr['deny_cid']), 'deny_cid' => expand_acl($rr['deny_cid']),

3
Zotlabs/Module/Editpost.php
View File

@ -45,7 +45,8 @@ class Editpost extends \Zotlabs\Web\Controller {
} }
if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) { if($itm[0]['resource_type'] === 'event' && $itm[0]['resource_id']) {
goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1'); goaway(z_root() . '/cdav/calendar');
//goaway(z_root() . '/events/' . $itm[0]['resource_id'] . '?expandform=1');
} }
$owner_uid = $itm[0]['uid']; $owner_uid = $itm[0]['uid'];