aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-04-29 11:45:55 +0200
committerMario Vavti <mario@mariovavti.com>2019-04-29 11:45:55 +0200
commitdce6a5763d925e6bf70c6a293be079a05269ce36 (patch)
tree7e06e30eff592f8097a2a3e63517acc663f2e555 /Zotlabs
parent0cecfceb14083141da389b7cc1e413ba5d5ca6d7 (diff)
downloadvolse-hubzilla-dce6a5763d925e6bf70c6a293be079a05269ce36.tar.gz
volse-hubzilla-dce6a5763d925e6bf70c6a293be079a05269ce36.tar.bz2
volse-hubzilla-dce6a5763d925e6bf70c6a293be079a05269ce36.zip
calendar merge: d&d support and some minor cleanup and fixes
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Channel_calendar.php13
1 files changed, 11 insertions, 2 deletions
diff --git a/Zotlabs/Module/Channel_calendar.php b/Zotlabs/Module/Channel_calendar.php
index d47d5ad49..ee7c722c3 100644
--- a/Zotlabs/Module/Channel_calendar.php
+++ b/Zotlabs/Module/Channel_calendar.php
@@ -524,6 +524,14 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
}
}
+ $allDay = false;
+
+ // allDay event rules
+ if(!strpos($start, 'T') && !strpos($end, 'T'))
+ $allDay = true;
+ if(strpos($start, 'T00:00:00') && strpos($end, 'T00:00:00'))
+ $allDay = true;
+
$is_first = ($d !== $last_date);
$last_date = $d;
@@ -550,12 +558,13 @@ class Channel_calendar extends \Zotlabs\Web\Controller {
'start'=> $start,
'end' => $end,
'drop' => $drop,
- 'allDay' => false,
+ 'allDay' => $allDay,
'title' => $title,
'j' => $j,
'd' => $d,
- 'is_editable' => $edit ? true : false,
+
+ 'editable' => $edit ? true : false,
'is_first'=>$is_first,
'item'=>$rr,