sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

replace Sabre_VObject_Element_DateTime with Sabre_VObject_Property_DateTime

remotes/origin/stable4
Georg Ehrke 2012-02-24 22:20:40 +07:00
parent e082d473bb
commit 1d1dfcbc1a
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/calendar/ajax/event/edit.form.php
Unescape Escape View File

@ -21,15 +21,15 @@ $vevent = $object->VEVENT;
$dtstart = $vevent->DTSTART; $dtstart = $vevent->DTSTART;
$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent); $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
switch($dtstart->getDateType()) { switch($dtstart->getDateType()) {
case Sabre_VObject_Element_DateTime::LOCALTZ: case Sabre_VObject_Property_DateTime::LOCALTZ:
case Sabre_VObject_Element_DateTime::LOCAL: case Sabre_VObject_Property_DateTime::LOCAL:
$startdate = $dtstart->getDateTime()->format('d-m-Y'); $startdate = $dtstart->getDateTime()->format('d-m-Y');
$starttime = $dtstart->getDateTime()->format('H:i'); $starttime = $dtstart->getDateTime()->format('H:i');
$enddate = $dtend->getDateTime()->format('d-m-Y'); $enddate = $dtend->getDateTime()->format('d-m-Y');
$endtime = $dtend->getDateTime()->format('H:i'); $endtime = $dtend->getDateTime()->format('H:i');
$allday = false; $allday = false;
break; break;
case Sabre_VObject_Element_DateTime::DATE: case Sabre_VObject_Property_DateTime::DATE:
$startdate = $dtstart->getDateTime()->format('d-m-Y'); $startdate = $dtstart->getDateTime()->format('d-m-Y');
$starttime = ''; $starttime = '';
$dtend->getDateTime()->modify('-1 day'); $dtend->getDateTime()->modify('-1 day');

12
apps/calendar/ajax/event/move.php
Unescape Escape View File

@ -24,19 +24,19 @@ $dtstart = $vevent->DTSTART;
$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent); $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
$start_type = $dtstart->getDateType(); $start_type = $dtstart->getDateType();
$end_type = $dtend->getDateType(); $end_type = $dtend->getDateType();
if ($allday && $start_type != Sabre_VObject_Element_DateTime::DATE){ if ($allday && $start_type != Sabre_VObject_Property_DateTime::DATE){
$start_type = $end_type = Sabre_VObject_Element_DateTime::DATE; $start_type = $end_type = Sabre_VObject_Property_DateTime::DATE;
$dtend->setDateTime($dtend->getDateTime()->modify('+1 day'), $end_type); $dtend->setDateTime($dtend->getDateTime()->modify('+1 day'), $end_type);
} }
if (!$allday && $start_type == Sabre_VObject_Element_DateTime::DATE){ if (!$allday && $start_type == Sabre_VObject_Property_DateTime::DATE){
$start_type = $end_type = Sabre_VObject_Element_DateTime::LOCALTZ; $start_type = $end_type = Sabre_VObject_Property_DateTime::LOCALTZ;
} }
$dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type); $dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type);
$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type); $dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
unset($vevent->DURATION); unset($vevent->DURATION);
$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC); $vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC); $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
$result = OC_Calendar_Object::edit($id, $vcalendar->serialize()); $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime(); $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();

4
apps/calendar/ajax/event/resize.php
Unescape Escape View File

@ -24,8 +24,8 @@ $end_type = $dtend->getDateType();
$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type); $dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
unset($vevent->DURATION); unset($vevent->DURATION);
$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC); $vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC); $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
$result = OC_Calendar_Object::edit($id, $vcalendar->serialize()); $result = OC_Calendar_Object::edit($id, $vcalendar->serialize());
$lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime(); $lastmodified = $vevent->__get('LAST-MODIFIED')->getDateTime();

2
apps/calendar/ajax/events.php
Unescape Escape View File

@ -47,7 +47,7 @@ foreach($events as $event){
$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent); $dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
$start_dt = $dtstart->getDateTime(); $start_dt = $dtstart->getDateTime();
$end_dt = $dtend->getDateTime(); $end_dt = $dtend->getDateTime();
if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){ if ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE){
$return_event['allDay'] = true; $return_event['allDay'] = true;
}else{ }else{
$return_event['allDay'] = false; $return_event['allDay'] = false;

18
apps/calendar/lib/object.php
Unescape Escape View File

@ -625,7 +625,7 @@ class OC_Calendar_Object{
$vevent = new OC_VObject('VEVENT'); $vevent = new OC_VObject('VEVENT');
$vcalendar->add($vevent); $vcalendar->add($vevent);
$vevent->setDateTime('CREATED', 'now', Sabre_VObject_Element_DateTime::UTC); $vevent->setDateTime('CREATED', 'now', Sabre_VObject_Property_DateTime::UTC);
$vevent->setUID(); $vevent->setUID();
return self::updateVCalendarFromRequest($request, $vcalendar); return self::updateVCalendarFromRequest($request, $vcalendar);
@ -786,24 +786,24 @@ class OC_Calendar_Object{
} }
$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC); $vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC); $vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
$vevent->setString('SUMMARY', $title); $vevent->setString('SUMMARY', $title);
$dtstart = new Sabre_VObject_Element_DateTime('DTSTART'); $dtstart = new Sabre_VObject_Property_DateTime('DTSTART');
$dtend = new Sabre_VObject_Element_DateTime('DTEND'); $dtend = new Sabre_VObject_Property_DateTime('DTEND');
if($allday){ if($allday){
$start = new DateTime($from); $start = new DateTime($from);
$end = new DateTime($to.' +1 day'); $end = new DateTime($to.' +1 day');
$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Element_DateTime::DATE); $vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::DATE);
$vevent->setDateTime('DTEND', $end, Sabre_VObject_Element_DateTime::DATE); $vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::DATE);
}else{ }else{
$timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get()); $timezone = OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'timezone', date_default_timezone_get());
$timezone = new DateTimeZone($timezone); $timezone = new DateTimeZone($timezone);
$start = new DateTime($from.' '.$fromtime, $timezone); $start = new DateTime($from.' '.$fromtime, $timezone);
$end = new DateTime($to.' '.$totime, $timezone); $end = new DateTime($to.' '.$totime, $timezone);
$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Element_DateTime::LOCALTZ); $vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::LOCALTZ);
$vevent->setDateTime('DTEND', $end, Sabre_VObject_Element_DateTime::LOCALTZ); $vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::LOCALTZ);
} }
unset($vevent->DURATION); unset($vevent->DURATION);

2
apps/calendar/lib/search.php
Unescape Escape View File

@ -26,7 +26,7 @@ class OC_Search_Provider_Calendar extends OC_Search_Provider{
$start_dt->setTimezone(new DateTimeZone($user_timezone)); $start_dt->setTimezone(new DateTimeZone($user_timezone));
$end_dt = $dtend->getDateTime(); $end_dt = $dtend->getDateTime();
$end_dt->setTimezone(new DateTimeZone($user_timezone)); $end_dt->setTimezone(new DateTimeZone($user_timezone));
if ($dtstart->getDateType() == Sabre_VObject_Element_DateTime::DATE){ if ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE){
$end_dt->modify('-1 sec'); $end_dt->modify('-1 sec');
if($start_dt->format('d.m.Y') != $end_dt->format('d.m.Y')){ if($start_dt->format('d.m.Y') != $end_dt->format('d.m.Y')){
$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y') . ' - ' . $end_dt->format('d.m.Y'); $info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y') . ' - ' . $end_dt->format('d.m.Y');

6
lib/vobject.php
Unescape Escape View File

@ -41,7 +41,7 @@ class OC_VObject{
*/ */
public static function parse($data){ public static function parse($data){
try { try {
Sabre_VObject_Property::$classMap['LAST-MODIFIED'] = 'Sabre_VObject_Element_DateTime'; Sabre_VObject_Property::$classMap['LAST-MODIFIED'] = 'Sabre_VObject_Property_DateTime';
$vobject = Sabre_VObject_Reader::read($data); $vobject = Sabre_VObject_Reader::read($data);
if ($vobject instanceof Sabre_VObject_Component){ if ($vobject instanceof Sabre_VObject_Component){
$vobject = new OC_VObject($vobject); $vobject = new OC_VObject($vobject);
@ -150,12 +150,12 @@ class OC_VObject{
* @param int $dateType * @param int $dateType
* @return void * @return void
*/ */
public function setDateTime($name, $datetime, $dateType=Sabre_VObject_Element_DateTime::LOCALTZ){ public function setDateTime($name, $datetime, $dateType=Sabre_VObject_Property_DateTime::LOCALTZ){
if ($datetime == 'now'){ if ($datetime == 'now'){
$datetime = new DateTime(); $datetime = new DateTime();
} }
if ($datetime instanceof DateTime){ if ($datetime instanceof DateTime){
$datetime_element = new Sabre_VObject_Element_DateTime($name); $datetime_element = new Sabre_VObject_Property_DateTime($name);
$datetime_element->setDateTime($datetime, $dateType); $datetime_element->setDateTime($datetime, $dateType);
$this->vobject->__set($name, $datetime_element); $this->vobject->__set($name, $datetime_element);
}else{ }else{