Skip to content

Expose boards as calendars #1545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 15 commits into from
Sep 15, 2020
Merged

Expose boards as calendars #1545

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
3cb278f
Add dav plugin to expose calendars
juliusknorr Feb 16, 2020
fc58439
Migrate CardMapper to query builder
juliusknorr Feb 16, 2020
08097ea
Map stacks to VTODO and link them as parent entries
juliusknorr Mar 7, 2020
a67a80f
Map assigned users to ATTENDEE
juliusknorr Mar 7, 2020
f420139
Fix VTODO and issues during rebase
juliusknorr Jun 14, 2020
42640e2
Some more restructuring
juliusknorr Aug 20, 2020
6502657
Fix info.xml to fit schema
juliusknorr Sep 1, 2020
341a962
Further cleanup
juliusknorr Sep 1, 2020
c2a4f94
Properly validate hex colors
juliusknorr Sep 1, 2020
3f7966a
Fix rebaseing issues
juliusknorr Sep 1, 2020
6ef1c32
Implement calendarQuery
juliusknorr Sep 15, 2020
2f44532
Fix internal board cache keys
juliusknorr Sep 15, 2020
1b16dba
Add calendar setting and move to more generic config ocs routes
juliusknorr Sep 15, 2020
19cdd31
Fix PageController tests
juliusknorr Sep 15, 2020
e460879
Set DUE instead of DTSTART and DTEND
juliusknorr Sep 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Properly validate hex colors 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Sep 11, 2020
commit c2a4f946b419ea4fc1d2f361a652d59fcec6734f
7 changes: 6 additions & 1 deletion lib/DAV/Calendar.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
use Sabre\DAV\Exception\Forbidden;
use Sabre\DAV\Exception\NotFound;
use Sabre\DAV\PropPatch;
use Sabre\VObject\InvalidDataException;

class Calendar extends ExternalCalendar {

Expand Down Expand Up @@ -164,7 +165,11 @@ public function propPatch(PropPatch $propPatch) {
$this->board->setTitle($value);
break;
case '{http://apple.com/ns/ical/}calendar-color':
$this->board->setColor(substr($value, 1));
$color = substr($value, 1, 6);
if (!preg_match('/[a-f0-9]{6}/i', $color)) {
throw new InvalidDataException('No valid color provided');
}
$this->board->setColor($color);
break;
}
}
Expand Down