$data .= "RRULE:" . $repeat . "\n";
}*/
$data .= "END:VEVENT\nEND:VCALENDAR";
- $result = OC_Calendar_Calendar::addCalendarObject($cal, $data);
+ $result = OC_Calendar_Object::add($cal, $data);
echo json_encode(array("success"=>"true"));
}
?>
<?php
$l=new OC_L10N('calendar');
OC::$CLASSPATH['OC_Calendar_Calendar'] = 'apps/calendar/lib/calendar.php';
+OC::$CLASSPATH['OC_Calendar_Object'] = 'apps/calendar/lib/object.php';
OC::$CLASSPATH['OC_Calendar_Hooks'] = 'apps/calendar/lib/hooks.php';
OC::$CLASSPATH['OC_Connector_Sabre_CalDAV'] = 'apps/calendar/lib/connector_sabre.php';
OC_HOOK::connect('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'deleteUser');
header("Location: " . OC_HELPER::linkTo("", "index.php"));
exit;
}
-$calobjects = OC_Calendar_Calendar::allCalendarObjects($cal);
+$calobjects = OC_Calendar_Object::all($cal);
header("Content-Type: text/Calendar");
header("Content-Disposition: inline; filename=calendar.ics");
for($i = 0;$i <= count($calobjects); $i++){
echo $calobjects[$i]["calendardata"] . "\n";
}
-?>
\ No newline at end of file
+?>
return true;
}
- /**
- * @brief Returns all objects of a calendar
- * @param integer $id
- * @return array
- *
- * The objects are associative arrays. You'll find the original vObject in
- * ['carddata']
- */
- public static function allCalendarObjects($id){
- $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
- $result = $stmt->execute(array($id));
-
- $calendarobjects = array();
- while( $row = $result->fetchRow()){
- $calendarobjects[] = $row;
- }
-
- return $calendarobjects;
- }
-
- /**
- * @brief Returns an object
- * @param integer $id
- * @return associative array
- */
- public static function findCalendarObject($id){
- $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE id = ?' );
- $result = $stmt->execute(array($id));
-
- return $result->fetchRow();
- }
-
- /**
- * @brief finds an object by its DAV Data
- * @param integer $cid Calendar id
- * @param string $uri the uri ('filename')
- * @return associative array
- */
- public static function findCalendarObjectWhereDAVDataIs($cid,$uri){
- $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri = ?' );
- $result = $stmt->execute(array($cid,$uri));
-
- return $result->fetchRow();
- }
-
- /**
- * @brief Adds an object
- * @param integer $id Calendar id
- * @param string $data object
- * @return insertid
- */
- public static function addCalendarObject($id,$data){
- $object = self::parse($data);
- list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
- if(is_null($uid)){
- $uid = self::createUID();
- $object->add('UID',$uid);
- $data = $object->serialize();
- }
-
- $uri = 'owncloud-'.md5($data.rand().time()).'.ics';
-
- $stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' );
- $result = $stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-
- self::touchCalendar($id);
-
- return OC_DB::insertid();
- }
-
- /**
- * @brief Adds an object with the data provided by sabredav
- * @param integer $id Calendar id
- * @param string $uri the uri the card will have
- * @param string $data object
- * @return insertid
- */
- public static function addCalendarObjectFromDAVData($id,$uri,$data){
- $object = self::parse($data);
- list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
- $stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' );
- $result = $stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-
- self::touchCalendar($id);
-
- return OC_DB::insertid();
- }
-
- /**
- * @brief edits an object
- * @param integer $id id of object
- * @param string $data object
- * @return boolean
- */
- public static function editCalendarObject($id, $data){
- $oldobject = self::findCalendarObject($id);
-
- $object = self::parse($data);
- list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
- $stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_objects SET objecttype=?,startdate=?,enddate=?,repeating=?,summary=?,calendardata=?, lastmodified = ? WHERE id = ?' );
- $result = $stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
-
- self::touchCalendar($id);
-
- return true;
- }
-
- /**
- * @brief edits an object with the data provided by sabredav
- * @param integer $id calendar id
- * @param string $uri the uri of the object
- * @param string $data object
- * @return boolean
- */
- public static function editCalendarObjectFromDAVData($cid,$uri,$data){
- $oldobject = self::findCalendarObjectWhereDAVDataIs($cid,$uri);
-
- $object = self::parse($data);
- list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
- $stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_objects SET objecttype=?,startdate=?,enddate=?,repeating=?,summary=?,calendardata=?, lastmodified = ? WHERE id = ?' );
- $result = $stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
-
- self::touchCalendar($oldobject['calendarid']);
-
- return true;
- }
-
- /**
- * @brief deletes an object
- * @param integer $id id of object
- * @return boolean
- */
- public static function deleteCalendarObject($id){
- $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE id = ?' );
- $stmt->execute(array($id));
-
- return true;
- }
-
- /**
- * @brief deletes an object with the data provided by sabredav
- * @param integer $cid calendar id
- * @param string $uri the uri of the object
- * @return boolean
- */
- public static function deleteCalendarObjectFromDAVData($cid,$uri){
- $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri=?' );
- $stmt->execute(array($cid,$uri));
-
- return true;
- }
-
/**
* @brief Creates a URI for Calendar
* @param string $name name of the calendar
return $newname;
}
- /**
- * @brief Creates a UID
- * @return string
- */
- public static function createUID(){
- return substr(md5(rand().time()),0,10);
- }
-
/**
* @brief gets the userid from a principal path
* @return string
list($prefix,$userid) = Sabre_DAV_URLUtil::splitPath($principaluri);
return $userid;
}
-
- /**
- * @brief Extracts data from a vObject-Object
- * @param Sabre_VObject $object
- * @return array
- *
- * [type, start, end, summary, repeating, uid]
- */
- protected static function extractData($object){
- $return = array('',null,null,'',0,null);
-
- // Child to use
- $children = 0;
- $use = null;
- foreach($object->children as &$property){
- if($property->name == 'VEVENT'){
- $children++;
- $thisone = true;
-
- foreach($property->children as &$element){
- if($element->name == 'RECURRENCE-ID'){
- $thisone = false;
- }
- } unset($element);
-
- if($thisone){
- $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
- if(!is_null($use)){
- $return[0] = $use->name;
- foreach($use->children as &$property){
- if($property->name == 'DTSTART'){
- $return[1] = self::getUTCforMDB($property->getDateTime());
- }
- elseif($property->name == 'DTEND'){
- $return[2] = self::getUTCforMDB($property->getDateTime());
- }
- elseif($property->name == 'SUMMARY'){
- $return[3] = $property->value;
- }
- elseif($property->name == 'RRULE'){
- $return[4] = 1;
- }
- elseif($property->name == 'UID'){
- $return[5] = $property->value;
- }
- } unset($property);
- }
-
- // More than one child means reoccuring!
- if($children > 1){
- $return[4] = 1;
- }
- return $return;
- }
-
- /**
- * @brief DateTime to UTC string
- * @param DateTime $datetime The date to convert
- * @returns date as YYYY-MM-DD hh:mm
- *
- * This function creates a date string that can be used by MDB2.
- * Furthermore it converts the time to UTC.
- */
- protected static function getUTCforMDB($datetime){
- return date('Y-m-d H:i', $datetime->format('U') - $datetime->getOffset());
- }
-
- /**
- * @brief Parses the VObject
- * @param string VObject as string
- * @returns Sabre_VObject or null
- *
- * This function creates a date string that can be used by MDB2.
- * Furthermore it converts the time to UTC.
- */
- public static function parse($data){
- try {
- $card = Sabre_VObject_Reader::read($data);
- return $card;
- } catch (Exception $e) {
- return null;
- }
- }
}
*/
public function getCalendarObjects($calendarId) {
$data = array();
- foreach(OC_Calendar_Calendar::allCalendarObjects($calendarId) as $row){
+ foreach(OC_Calendar_Object::all($calendarId) as $row){
$data[] = $this->OCAddETag($row);
}
return $data;
* @return array
*/
public function getCalendarObject($calendarId,$objectUri) {
- $data = OC_Calendar_Calendar::findCalendarObjectWhereDAVDataIs($calendarId,$objectUri);
+ $data = OC_Calendar_Object::findWhereDAVDataIs($calendarId,$objectUri);
if(is_array($data)){
$data = $this->OCAddETag($data);
}
* @return void
*/
public function createCalendarObject($calendarId,$objectUri,$calendarData) {
- OC_Calendar_Calendar::addCalendarObjectFromDAVData($calendarId,$objectUri,$calendarData);
+ OC_Calendar_Object::addFromDAVData($calendarId,$objectUri,$calendarData);
}
/**
* @return void
*/
public function updateCalendarObject($calendarId,$objectUri,$calendarData){
- OC_Calendar_Calendar::editCalendarObjectFromDAVData($calendarId,$objectUri,$calendarData);
+ OC_Calendar_Object::editFromDAVData($calendarId,$objectUri,$calendarData);
}
/**
* @return void
*/
public function deleteCalendarObject($calendarId,$objectUri){
- OC_Calendar_Calendar::deleteCalendarObjectFromDAVData($calendarId,$objectUri);
+ OC_Calendar_Object::deleteFromDAVData($calendarId,$objectUri);
}
/**
--- /dev/null
+<?php
+/**
+ * ownCloud - Calendar
+ *
+ * @author Jakob Sack
+ * @copyright 2011 Jakob Sack mail@jakobsack.de
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+/**
+ * This class manages our calendars
+ */
+class OC_Calendar_Object{
+ /**
+ * @brief Returns all objects of a calendar
+ * @param integer $id
+ * @return array
+ *
+ * The objects are associative arrays. You'll find the original vObject in
+ * ['calendardata']
+ */
+ public static function all($id){
+ $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
+ $result = $stmt->execute(array($id));
+
+ $calendarobjects = array();
+ while( $row = $result->fetchRow()){
+ $calendarobjects[] = $row;
+ }
+
+ return $calendarobjects;
+ }
+
+ /**
+ * @brief Returns an object
+ * @param integer $id
+ * @return associative array
+ */
+ public static function find($id){
+ $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE id = ?' );
+ $result = $stmt->execute(array($id));
+
+ return $result->fetchRow();
+ }
+
+ /**
+ * @brief finds an object by its DAV Data
+ * @param integer $cid Calendar id
+ * @param string $uri the uri ('filename')
+ * @return associative array
+ */
+ public static function findWhereDAVDataIs($cid,$uri){
+ $stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri = ?' );
+ $result = $stmt->execute(array($cid,$uri));
+
+ return $result->fetchRow();
+ }
+
+ /**
+ * @brief Adds an object
+ * @param integer $id Calendar id
+ * @param string $data object
+ * @return insertid
+ */
+ public static function add($id,$data){
+ $object = self::parse($data);
+ list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
+
+ if(is_null($uid)){
+ $uid = self::createUID();
+ $object->add('UID',$uid);
+ $data = $object->serialize();
+ }
+
+ $uri = 'owncloud-'.md5($data.rand().time()).'.ics';
+
+ $stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' );
+ $result = $stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
+
+ OC_Calendar_Calendar::touchCalendar($id);
+
+ return OC_DB::insertid();
+ }
+
+ /**
+ * @brief Adds an object with the data provided by sabredav
+ * @param integer $id Calendar id
+ * @param string $uri the uri the card will have
+ * @param string $data object
+ * @return insertid
+ */
+ public static function addFromDAVData($id,$uri,$data){
+ $object = self::parse($data);
+ list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
+
+ $stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' );
+ $result = $stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
+
+ OC_Calendar_Calendar::touchCalendar($id);
+
+ return OC_DB::insertid();
+ }
+
+ /**
+ * @brief edits an object
+ * @param integer $id id of object
+ * @param string $data object
+ * @return boolean
+ */
+ public static function edit($id, $data){
+ $oldobject = self::find($id);
+
+ $object = self::parse($data);
+ list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
+
+ $stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_objects SET objecttype=?,startdate=?,enddate=?,repeating=?,summary=?,calendardata=?, lastmodified = ? WHERE id = ?' );
+ $result = $stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
+
+ OC_Calendar_Calendar::touchCalendar($id);
+
+ return true;
+ }
+
+ /**
+ * @brief edits an object with the data provided by sabredav
+ * @param integer $id calendar id
+ * @param string $uri the uri of the object
+ * @param string $data object
+ * @return boolean
+ */
+ public static function editFromDAVData($cid,$uri,$data){
+ $oldobject = self::findWhereDAVDataIs($cid,$uri);
+
+ $object = self::parse($data);
+ list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
+
+ $stmt = OC_DB::prepare( 'UPDATE *PREFIX*calendar_objects SET objecttype=?,startdate=?,enddate=?,repeating=?,summary=?,calendardata=?, lastmodified = ? WHERE id = ?' );
+ $result = $stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
+
+ OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
+
+ return true;
+ }
+
+ /**
+ * @brief deletes an object
+ * @param integer $id id of object
+ * @return boolean
+ */
+ public static function delete($id){
+ $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE id = ?' );
+ $stmt->execute(array($id));
+
+ return true;
+ }
+
+ /**
+ * @brief deletes an object with the data provided by sabredav
+ * @param integer $cid calendar id
+ * @param string $uri the uri of the object
+ * @return boolean
+ */
+ public static function deleteFromDAVData($cid,$uri){
+ $stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri=?' );
+ $stmt->execute(array($cid,$uri));
+
+ return true;
+ }
+
+ /**
+ * @brief Creates a UID
+ * @return string
+ */
+ protected static function createUID(){
+ return substr(md5(rand().time()),0,10);
+ }
+
+ /**
+ * @brief Extracts data from a vObject-Object
+ * @param Sabre_VObject $object
+ * @return array
+ *
+ * [type, start, end, summary, repeating, uid]
+ */
+ protected static function extractData($object){
+ $return = array('',null,null,'',0,null);
+
+ // Child to use
+ $children = 0;
+ $use = null;
+ foreach($object->children as &$property){
+ if($property->name == 'VEVENT'){
+ $children++;
+ $thisone = true;
+
+ foreach($property->children as &$element){
+ if($element->name == 'RECURRENCE-ID'){
+ $thisone = false;
+ }
+ } unset($element);
+
+ if($thisone){
+ $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
+ if(!is_null($use)){
+ $return[0] = $use->name;
+ foreach($use->children as &$property){
+ if($property->name == 'DTSTART'){
+ $return[1] = self::getUTCforMDB($property->getDateTime());
+ }
+ elseif($property->name == 'DTEND'){
+ $return[2] = self::getUTCforMDB($property->getDateTime());
+ }
+ elseif($property->name == 'SUMMARY'){
+ $return[3] = $property->value;
+ }
+ elseif($property->name == 'RRULE'){
+ $return[4] = 1;
+ }
+ elseif($property->name == 'UID'){
+ $return[5] = $property->value;
+ }
+ } unset($property);
+ }
+
+ // More than one child means reoccuring!
+ if($children > 1){
+ $return[4] = 1;
+ }
+ return $return;
+ }
+
+ /**
+ * @brief DateTime to UTC string
+ * @param DateTime $datetime The date to convert
+ * @returns date as YYYY-MM-DD hh:mm
+ *
+ * This function creates a date string that can be used by MDB2.
+ * Furthermore it converts the time to UTC.
+ */
+ protected static function getUTCforMDB($datetime){
+ return date('Y-m-d H:i', $datetime->format('U') - $datetime->getOffset());
+ }
+
+ /**
+ * @brief Parses the VObject
+ * @param string VObject as string
+ * @returns Sabre_VObject or null
+ */
+ public static function parse($data){
+ try {
+ $calendar = Sabre_VObject_Reader::read($data);
+ return $calendar;
+ } catch (Exception $e) {
+ return null;
+ }
+ }
+}
* MA 02111-1307 USA *
*************************************************/
$calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1);
-$events = OC_Calendar_Calendar::allCalendarObjects($calendars[0]['id']);
+$events = OC_Calendar_Object::all($calendars[0]['id']);
$select_year = $_GET["year"];
$return_events = array();
$user_timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone", "Europe/London");
projects / nextcloud-server.git / commitdiff