mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'calendar' of git.kde.org:owncloud into calendar

This commit is contained in:
Georg Ehrke 2011-08-28 20:16:40 +02:00
parent ca08ccb61c 112eccfe33
commit 947216942a
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/calendar/lib/calendar.php
View File

@ -79,7 +79,7 @@ class OC_Calendar_Calendar{
return $result->fetchRow();
}
public static function addCalendar($userid,$name,$description,$components='VEVENT,VTODO',$timezone=null,$order=0,$color=null){
public static function addCalendar($userid,$name,$description,$components='VEVENT,VTODO,VJOURNAL',$timezone=null,$order=0,$color=null){
$all = self::allCalendars($userid);
$uris = array();
foreach($all as $i){
@ -279,6 +279,22 @@ class OC_Calendar_Calendar{
$use = $property;
}
}
elseif($property->name == 'VTODO' || $property->name == 'VJOURNAL'){
$return[0] = $use->name;
foreach($property->children as &$element){
if($property->name == 'SUMMARY'){
$return[3] = $property->value;
}
elseif($property->name == 'UID'){
$return[5] = $property->value;
}
};
// Only one VTODO or VJOURNAL per object
// (only one UID per object but a UID is required by a VTODO =>
// one VTODO per object)
break;
}
} unset($property);
// find the data

24
apps/calendar/lib/connector_sabre.php
View File

@ -235,7 +235,11 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
* @return array
*/
public function getCalendarObjects($calendarId) {
return OC_Calendar_Calendar::allCalendarObjects($calendarId);
$data = array();
foreach(OC_Calendar_Calendar::allCalendarObjects($calendarId) as $row){
$data[] = $this->OCAddETag($row);
}
return $data;
}
/**
@ -251,7 +255,11 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
* @return array
*/
public function getCalendarObject($calendarId,$objectUri) {
return OC_Calendar_Calendar::findCalendarObjectWhereDAVDataIs($calendarId,$objectUri);
$data = OC_Calendar_Calendar::findCalendarObjectWhereDAVDataIs($calendarId,$objectUri);
if(is_array($data)){
$data = $this->OCAddETag($data);
}
return $data;
}
/**
@ -288,4 +296,16 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
public function deleteCalendarObject($calendarId,$objectUri){
OC_Calendar_Calendar::deleteCalendarObjectFromDAVData($calendarID,$objectUri);
}
/**
* @brief Creates a etag
* @param array $row Database result
* @returns associative array
*
* Adds a key "etag" to the row
*/
private function OCAddETag($row){
$row['etag'] = '"'.md5($row['calendarid'].$row['uri'].$row['calendardata'].$row['lastmodified']).'"';
return $row;
}
}