Changeset 6440

Timestamp:

06/06/12 15:49:30 (11 years ago)

Author:

eduardow

Message:

Ticket #2840 - Compatibilização de arquivos caldav com suporte a contas compartilhadas.

Location:

branches/2.4/expressoCalendar/docs

Files:

• caldav-DELETE.php.diff (modified) (1 diff)
• caldav-PUT-vcalendar.php.diff (modified) (1 diff)

branches/2.4/expressoCalendar/docs/caldav-DELETE.php.diff

@@ -15 +15 @@
 +     $dav_name = explode('/', $dav_resource->GetProperty('dav_name'));
 +
-+    DAViCalAdapter::delete($dav_resource->GetProperty('caldav_data') ,array('owner' => $dav_resource->GetProperty('username') , 'calendarName' => $dav_name[ (count($dav_name)-2) ]) );
++    DAViCalAdapter::delete($dav_resource->GetProperty('caldav_data') ,array('owner' => $dav_resource->GetProperty('username') , 'calendarName' => $dav_name[ (count($dav_name)-3) ]) .'/'. $dav_name[ (count($dav_name)-2) ]);
 +  }
 +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

branches/2.4/expressoCalendar/docs/caldav-PUT-vcalendar.php.diff

@@ -14 +14 @@
 +   $params = array();
 +   $dav_name = explode('/', $dav_resource->GetProperty('dav_name'));
-+   $params['calendarName'] = $dav_name[ (count($dav_name)-2) ];
++   $params['calendarName'] = $dav_name[ (count($dav_name)-3) ] .'/'. $dav_name[ (count($dav_name)-2) ]; 
 +   $params['owner'] =  $session->username;
 +   $params['action'] = $put_action_type;