rysiek/owncalendar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

some fixes for export with sharing

Browse source
This commit is contained in:
Georg Ehrke 2013-01-31 17:52:50 +01:00
parent c5eeec7919
commit 778e1ce985
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
export.php
View file

@ -9,19 +9,19 @@ OCP\User::checkLoggedIn();
OCP\App::checkAppEnabled('calendar');
$cal = isset($_GET['calid']) ? $_GET['calid'] : null;
$event = isset($_GET['eventid']) ? $_GET['eventid'] : null;
if(isset($cal)) {
if(!is_null($cal)) {
$calendar = OC_Calendar_App::getCalendar($cal, true);
if(!$calendar) {
header('HTTP/1.0 404 Not Found');
header('HTTP/1.0 403 Forbidden');
exit;
}
header('Content-Type: text/calendar');
header('Content-Disposition: inline; filename=' . str_replace(' ', '-', $calendar['displayname']) . '.ics');
echo OC_Calendar_Export::export($cal, OC_Calendar_Export::CALENDAR);
}elseif(isset($event)) {
}elseif(!is_null($event)) {
$data = OC_Calendar_App::getEventObject($_GET['eventid'], true);
if(!$data) {
header('HTTP/1.0 404 Not Found');
header('HTTP/1.0 403 Forbidden');
exit;
}
header('Content-Type: text/calendar');

9
lib/app.php
View file

@ -42,7 +42,14 @@ class OC_Calendar_App{
$calendar = OC_Calendar_Calendar::find($id);
// FIXME: Correct arguments to just check for permissions
if($security === true || $shared === true) {
if($security === true && $shared === false) {
if(OCP\User::getUser() === $calendar['userid']){
return $calendar;
}else{
return false;
}
}
if($security === true && $shared === true) {
if(OCP\Share::getItemSharedWithBySource('calendar', $id)) {
return $calendar;
}