upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-08 16:26:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

fix calendarid in eventform and validation of calendarid

Browse source
This commit is contained in:
Georg Ehrke 2012-04-12 23:15:19 -04:00
parent a7908ba76b
commit df2e788a1c
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/calendar/ajax/event/edit.form.php
View file

@ -195,6 +195,8 @@ if($data['repeating'] == 1){
}
if($access == 'owner'){
$calendar_options = OC_Calendar_Calendar::allCalendars(OC_User::getUser());
}else{
$calendar_options = array(OC_Calendar_App::getCalendar($data['calendarid'], false));
}
$category_options = OC_Calendar_App::getCategoryOptions();
$repeat_options = OC_Calendar_App::getRepeatOptions();

5
apps/calendar/lib/object.php
View file

@ -451,11 +451,6 @@ class OC_Calendar_Object{
$errarr['title'] = 'true';
$errnum++;
}
$calendar = OC_Calendar_App::getCalendar($request['calendar'], true, true);
if(!$calendar){
$errarr['cal'] = 'true';
$errnum++;
}
if(isset($request['categories']) && !is_array($request['categories'])){
$errarr['categories'] = $l10n->t('Not an array');

10
apps/calendar/lib/share.php
View file

@ -211,17 +211,17 @@ class OC_Calendar_Share{
*/
public static function check_access($share, $id, $type){
$group_where = self::group_sql(OC_Group::getUserGroups($share));
$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE ((share = ? AND sharetype = "user") ' . $group_where . ')');
$result = $stmt->execute(array($share));
$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*calendar_share_' . $type . ' WHERE (' . $type . 'id = ? AND (share = ? AND sharetype = "user") ' . $group_where . ')');
$result = $stmt->execute(array($id,$share));
$rows = $result->numRows();
if($rows > 0){
return true;
}
if($type == self::EVENT){
}elseif($type == self::EVENT){
$event = OC_Calendar_App::getEventObject($id, false, false);
return self::check_access($share, $event['calendarid'], self::CALENDAR);
}else{
return false;
}
return false;
}
/*
* @brief: returns the calendardata of an event or a calendar

2
apps/calendar/templates/part.eventform.php
View file

@ -44,7 +44,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
<?php } else { ?>
<th width="75px">&nbsp;</th>
<td>
<input type="hidden" name="calendar" value="<?php echo $_['calendar']; ?>">
<input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id']; ?>">
</td>
<?php } ?>
</tr>