Skip to content
Snippets Groups Projects
Commit 8cff0d99 authored by Georg Ehrke's avatar Georg Ehrke
Browse files

convert through caldav transmitted rgba calendarcolor to rgb

parent 12dfe586
Branches
No related tags found
No related merge requests found
...@@ -105,6 +105,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract { ...@@ -105,6 +105,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
if(!isset($newValues['timezone'])) $newValues['timezone'] = null; if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = 0; if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = 0;
if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null; if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
}
return OC_Calendar_Calendar::addCalendarFromDAVData($principalUri,$calendarUri,$newValues['displayname'],$newValues['components'],$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']); return OC_Calendar_Calendar::addCalendarFromDAVData($principalUri,$calendarUri,$newValues['displayname'],$newValues['components'],$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
} }
...@@ -192,6 +195,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract { ...@@ -192,6 +195,9 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
if(!isset($newValues['timezone'])) $newValues['timezone'] = null; if(!isset($newValues['timezone'])) $newValues['timezone'] = null;
if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = null; if(!isset($newValues['calendarorder'])) $newValues['calendarorder'] = null;
if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null; if(!isset($newValues['calendarcolor'])) $newValues['calendarcolor'] = null;
if(!is_null($newValues['calendarcolor']) && strlen($newValues['calendarcolor']) == 9){
$newValues['calendarcolor'] = substr($newValues['calendarcolor'], 0, 7);
}
OC_Calendar_Calendar::editCalendar($calendarId,$newValues['displayname'],null,$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']); OC_Calendar_Calendar::editCalendar($calendarId,$newValues['displayname'],null,$newValues['timezone'],$newValues['calendarorder'],$newValues['calendarcolor']);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment