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

Use CRUDS consts as defined in https://github.com/owncloud/core/pull/356

master
Thomas Tanghus 2012-11-11 19:43:44 +01:00
parent e327df38f2
commit 5cb36db034
12 changed files with 38 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ajax/calendar/update.php
View File

@ -45,7 +45,7 @@ $tmpl->assign('calendar', $calendar);
$shared = false;
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $calendarid);
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
$shared = true;
}
}

4
ajax/event/edit.form.php
View File

@ -209,9 +209,9 @@ $repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
if($permissions & OCP\Share::PERMISSION_UPDATE) {
if($permissions & OCP\PERMISSION_UPDATE) {
$tmpl = new OCP\Template('calendar', 'part.editevent');
} elseif($permissions & OCP\Share::PERMISSION_READ) {
} elseif($permissions & OCP\PERMISSION_READ) {
$tmpl = new OCP\Template('calendar', 'part.showevent');
}

2
ajax/event/new.form.php
View File

@ -37,7 +37,7 @@ $calendar_options = array();
foreach($calendars as $calendar) {
if($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $calendar['id']);
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
array_push($calendar_options, $calendar);
}
} else {

2
ajax/event/resize.php
View File

@ -12,7 +12,7 @@ OCP\JSON::callCheck();
$id = $_POST['id'];
$permissions = OC_Calendar_App::getPermissions($id, OC_Calendar_App::EVENT);
if(!$permissions & OCP\Share::PERMISSION_UPDATE) {
if(!$permissions & OCP\PERMISSION_UPDATE) {
OCP\JSON::error(array('message'=>'permission denied'));
exit;
}

4
lib/app.php
View File

@ -296,9 +296,7 @@ class OC_Calendar_App{
* @see OCP\Share
*/
public static function getPermissions($id, $type) {
$permissions_all = OCP\Share::PERMISSION_CREATE
| OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE
| OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE;
$permissions_all = OCP\PERMISSION_ALL;
if($type == self::CALENDAR) {
$calendar = self::getCalendar($id, false, false);

20
lib/calendar.php
View File

@ -47,9 +47,9 @@ class OC_Calendar_Calendar{
$calendars = array();
while( $row = $result->fetchRow()) {
$row['permissions'] = OCP\Share::PERMISSION_CREATE
| OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE
| OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE;
$row['permissions'] = OCP\PERMISSION_CREATE
| OCP\PERMISSION_READ | OCP\PERMISSION_UPDATE
| OCP\PERMISSION_DELETE | OCP\PERMISSION_SHARE;
$calendars[] = $row;
}
$calendars = array_merge($calendars, OCP\Share::getItemsSharedWith('calendar', OC_Share_Backend_Calendar::FORMAT_CALENDAR));
@ -79,14 +79,12 @@ class OC_Calendar_Calendar{
$row = $result->fetchRow();
if($row['userid'] != OCP\USER::getUser() && !OC_Group::inGroup(OCP\User::getUser(), 'admin')) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_READ)) {
return $row; // I have to return the row so e.g. OC_Calendar_Object::getowner() works.
}
$row['permissions'] = $sharedCalendar['permissions'];
} else {
$row['permissions'] = OCP\Share::PERMISSION_CREATE
| OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE
| OCP\Share::PERMISSION_DELETE | OCP\Share::PERMISSION_SHARE;
$row['permissions'] = OCP\PERMISSION_ALL;
}
return $row;
}
@ -159,7 +157,7 @@ class OC_Calendar_Calendar{
$calendar = self::find($id);
if ($calendar['userid'] != OCP\User::getUser() && !OC_Group::inGroup(OCP\User::getUser(), 'admin')) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to update this calendar.'
@ -192,7 +190,7 @@ class OC_Calendar_Calendar{
$calendar = self::find($id);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to update this calendar.'
@ -227,7 +225,7 @@ class OC_Calendar_Calendar{
$calendar = self::find($id);
if ($calendar['userid'] != OCP\User::getUser() && !OC_Group::inGroup(OCP\User::getUser(), 'admin')) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_DELETE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_DELETE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to delete this calendar.'
@ -261,7 +259,7 @@ class OC_Calendar_Calendar{
$calendar = self::find($id1);
if ($calendar['userid'] != OCP\User::getUser() && !OC_Group::inGroup(OCP\User::getUser(), 'admin')) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id1);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to add to this calendar.'

16
lib/object.php
View File

@ -116,7 +116,7 @@ class OC_Calendar_Object{
$calendar = OC_Calendar_Calendar::find($id);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_CREATE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_CREATE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to add events to this calendar.'
@ -155,7 +155,7 @@ class OC_Calendar_Object{
$calendar = OC_Calendar_Calendar::find($id);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_CREATE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_CREATE)) {
throw new Sabre_DAV_Exception_Forbidden(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to add events to this calendar.'
@ -187,7 +187,7 @@ class OC_Calendar_Object{
$calendar = OC_Calendar_Calendar::find($oldobject['calendarid']);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to edit this event.'
@ -221,7 +221,7 @@ class OC_Calendar_Object{
$calendar = OC_Calendar_Calendar::find($cid);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $cid);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
throw new Sabre_DAV_Exception_Forbidden(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to edit this event.'
@ -251,7 +251,7 @@ class OC_Calendar_Object{
$calendar = OC_Calendar_Calendar::find($oldobject['calendarid']);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_DELETE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_DELETE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to delete this event.'
@ -264,7 +264,7 @@ class OC_Calendar_Object{
OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
OCP\Share::unshareAll('event', $id);
OCP\Util::emitHook('OC_Calendar', 'deleteEvent', $id);
return true;
@ -281,7 +281,7 @@ class OC_Calendar_Object{
$calendar = OC_Calendar_Calendar::find($cid);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $cid);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_DELETE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_DELETE)) {
throw new Sabre_DAV_Exception_Forbidden(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to delete this event.'
@ -301,7 +301,7 @@ class OC_Calendar_Object{
$calendar = OC_Calendar_Calendar::find($calendarid);
if ($calendar['userid'] != OCP\User::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $id);
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\Share::PERMISSION_DELETE)) {
if (!$sharedCalendar || !($sharedCalendar['permissions'] & OCP\PERMISSION_DELETE)) {
throw new Exception(
OC_Calendar_App::$l10n->t(
'You do not have the permissions to add events to this calendar.'

4
lib/sabre/calendar.php
View File

@ -48,10 +48,10 @@ class OC_Connector_Sabre_CalDAV_Calendar extends Sabre_CalDAV_Calendar {
if($uid != OCP\USER::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->calendarInfo['id']);
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) {
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\PERMISSION_READ)) {
$readprincipal = 'principals/' . OCP\USER::getUser();
}
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
$writeprincipal = 'principals/' . OCP\USER::getUser();
}
}

4
lib/sabre/object.php
View File

@ -46,10 +46,10 @@ class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObje
if($uid != OCP\USER::getUser()) {
$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->calendarInfo['id']);
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) {
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\PERMISSION_READ)) {
$readprincipal = 'principals/' . OCP\USER::getUser();
}
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\PERMISSION_UPDATE)) {
$writeprincipal = 'principals/' . OCP\USER::getUser();
}
}

6
templates/part.choosecalendar.rowfields.php
View File

@ -7,7 +7,7 @@
<label for="active_<?php echo $_['calendar']['id'] ?>"><?php echo $_['calendar']['displayname'] ?></label>
</td>
<td width="20px">
<?php if($_['calendar']['permissions'] & OCP\Share::PERMISSION_SHARE) { ?>
<?php if($_['calendar']['permissions'] & OCP\PERMISSION_SHARE) { ?>
<a href="#" class="share" data-item-type="calendar" data-item="<?php echo $_['calendar']['id']; ?>"
data-possible-permissions="<?php echo $_['calendar']['permissions'] ?>"
title="<?php echo $l->t('Share Calendar') ?>" class="action"><img class="svg action" src="<?php echo (!$_['shared']) ? OCP\Util::imagePath('core', 'actions/share.svg') : OCP\Util::imagePath('core', 'actions/shared.svg') ?>"></a>
@ -27,12 +27,12 @@ if($_['calendar']['userid'] == OCP\USER::getUser()){
<a href="<?php echo OCP\Util::linkTo('calendar', 'export.php') . '?calid=' . $_['calendar']['id'] ?>" title="<?php echo $l->t('Download') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/download.svg') ?>"></a>
</td>
<td width="20px">
<?php if($_['calendar']['permissions'] & OCP\Share::PERMISSION_UPDATE) { ?>
<?php if($_['calendar']['permissions'] & OCP\PERMISSION_UPDATE) { ?>
<a href="#" onclick="Calendar.UI.Calendar.edit(this, <?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Edit') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/rename.svg') ?>"></a>
<?php } ?>
</td>
<td width="20px">
<?php if($_['calendar']['permissions'] & OCP\Share::PERMISSION_DELETE) { ?>
<?php if($_['calendar']['permissions'] & OCP\PERMISSION_DELETE) { ?>
<a href="#" onclick="Calendar.UI.Calendar.deleteCalendar(<?php echo $_['calendar']['id'] ?>);" title="<?php echo $l->t('Delete') ?>" class="action"><img class="svg action" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>"></a>
<?php } ?>
</td>

4
templates/part.eventform.php
View File

@ -9,7 +9,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
<li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li>
<!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li>
<li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>-->
<?php if($_['eventid'] != 'new' && $_['permissions'] & OCP\Share::PERMISSION_SHARE) { ?>
<?php if($_['eventid'] != 'new' && $_['permissions'] & OCP\PERMISSION_SHARE) { ?>
<li><a href="#tabs-5"><?php echo $l->t('Share'); ?></a></li>
<?php } ?>
</ul>
@ -244,7 +244,7 @@ echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid
</div>
<!--<div id="tabs-3">//Alarm</div>
<div id="tabs-4">//Attendees</div>-->
<?php if($_['eventid'] != 'new' && $_['permissions'] & OCP\Share::PERMISSION_SHARE) { ?>
<?php if($_['eventid'] != 'new' && $_['permissions'] & OCP\PERMISSION_SHARE) { ?>
<div id="tabs-5">
<?php if($_['eventid'] != 'new') { echo $this->inc('part.share'); } ?>
</div>

12
templates/part.share.php
View File

@ -37,11 +37,11 @@ if(is_array($sharedwithByEvent)) {
data-share-type="<?php echo $sharee['share_type']; ?>">
<?php echo $sharee['share_with'] . ' (' . ($sharee['share_type'] == OCP\Share::SHARE_TYPE_USER ? 'user' : 'group'). ')'; ?>
<span class="shareactions">
<input class="update" type="checkbox" <?php echo ($sharee['permissions'] & OCP\Share::PERMISSION_UPDATE?'checked="checked"':'')?>
<input class="update" type="checkbox" <?php echo ($sharee['permissions'] & OCP\PERMISSION_UPDATE?'checked="checked"':'')?>
title="<?php echo $l->t('Editable'); ?>">
<input class="share" type="checkbox" <?php echo ($sharee['permissions'] & OCP\Share::PERMISSION_SHARE?'checked="checked"':'')?>
<input class="share" type="checkbox" <?php echo ($sharee['permissions'] & OCP\PERMISSION_SHARE?'checked="checked"':'')?>
title="<?php echo $l->t('Shareable'); ?>">
<input class="delete" type="checkbox" <?php echo ($sharee['permissions'] & OCP\Share::PERMISSION_DELETE?'checked="checked"':'')?>
<input class="delete" type="checkbox" <?php echo ($sharee['permissions'] & OCP\PERMISSION_DELETE?'checked="checked"':'')?>
title="<?php echo $l->t('Deletable'); ?>">
<img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action delete"
title="<?php echo $l->t('Unshare'); ?>">
@ -63,11 +63,11 @@ if(is_array($sharedwithByEvent)) {
data-share-type="<?php echo $sharee['share_type']; ?>">
<?php echo $sharee['share_with'] . ' (' . ($sharee['share_type'] == OCP\Share::SHARE_TYPE_USER ? 'user' : 'group'). ')'; ?>
<span class="shareactions">
<input class="update" type="checkbox" <?php echo ($sharee['permissions'] & OCP\Share::PERMISSION_UPDATE?'checked="checked"':'')?>
<input class="update" type="checkbox" <?php echo ($sharee['permissions'] & OCP\PERMISSION_UPDATE?'checked="checked"':'')?>
title="<?php echo $l->t('Editable'); ?>">
<input class="share" type="checkbox" <?php echo ($sharee['permissions'] & OCP\Share::PERMISSION_SHARE?'checked="checked"':'')?>
<input class="share" type="checkbox" <?php echo ($sharee['permissions'] & OCP\PERMISSION_SHARE?'checked="checked"':'')?>
title="<?php echo $l->t('Shareable'); ?>">
<input class="delete" type="checkbox" <?php echo ($sharee['permissions'] & OCP\Share::PERMISSION_DELETE?'checked="checked"':'')?>
<input class="delete" type="checkbox" <?php echo ($sharee['permissions'] & OCP\PERMISSION_DELETE?'checked="checked"':'')?>
title="<?php echo $l->t('Deletable'); ?>">
<img src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg'); ?>" class="svg action delete"
title="<?php echo $l->t('Unshare'); ?>">