[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.18,
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.18,1.71.2.19 class.uicalendar.inc.php,1.66.2.27,1.66.2.28 |
Date: |
Mon, 28 Oct 2002 12:44:13 -0500 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv6707
Modified Files:
Tag: Version-0_9_14-branch
class.bocalendar.inc.php class.uicalendar.inc.php
Log Message:
got deleting working again
solves savanah bugs: #830, #946
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.18
retrieving revision 1.71.2.19
diff -C2 -r1.71.2.18 -r1.71.2.19
*** class.bocalendar.inc.php 28 Oct 2002 16:58:58 -0000 1.71.2.18
--- class.bocalendar.inc.php 28 Oct 2002 17:44:10 -0000 1.71.2.19
***************
*** 505,509 ****
if($this->check_perms(PHPGW_ACL_DELETE,$id))
{
! $temp_event = $this->read_entry($id);
// if($this->owner == $temp_event['owner'])
// {
--- 505,509 ----
if($this->check_perms(PHPGW_ACL_DELETE,$id))
{
! // $temp_event = $this->read_entry($id);
// if($this->owner == $temp_event['owner'])
// {
***************
*** 574,588 ****
function expunge()
{
! if($this->check_perms(PHPGW_ACL_DELETE))
{
! reset($this->so->cal->deleted_events);
!
for($i=0;$i<count($this->so->cal->deleted_events);$i++)
{
- $event_id =
$this->so->cal->deleted_events[$i];
- $event =
$this->so->read_entry($event_id);
$this->send_update(MSG_DELETED,$event['participants'],$event);
}
! $this->so->expunge();
}
}
--- 574,591 ----
function expunge()
{
! reset($this->so->cal->deleted_events);
! while(list($i,$event_id) =
each($this->so->cal->deleted_events))
{
! $event = $this->so->read_entry($event_id);
! if($this->check_perms(PHPGW_ACL_DELETE,$event))
{
$this->send_update(MSG_DELETED,$event['participants'],$event);
}
! else
! {
!
unset($this->so->cal->deleted_events[$i]);
! }
}
+ $this->so->expunge();
}
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.27
retrieving revision 1.66.2.28
diff -C2 -r1.66.2.27 -r1.66.2.28
*** class.uicalendar.inc.php 28 Oct 2002 16:58:58 -0000 1.66.2.27
--- class.uicalendar.inc.php 28 Oct 2002 17:44:10 -0000 1.66.2.28
***************
*** 1118,1131 ****
$date =
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day);
- $event =
$this->bo->read_entry(intval($GLOBALS['HTTP_GET_VARS']['cal_id']));
// if(($GLOBALS['HTTP_GET_VARS']['cal_id'] > 0) &&
($event['owner'] == $this->bo->owner) &&
$this->bo->check_perms(PHPGW_ACL_DELETE))
! if($this->bo->check_perms(PHPGW_ACL_DELETE,$event))
{
-
if(isset($GLOBALS['HTTP_POST_VARS']['delete_type']) &&
$GLOBALS['HTTP_POST_VARS']['delete_type'] == 'single')
{
$cd = $this->bo->delete_single(
Array(
! 'id' =>
intval($GLOBALS['HTTP_GET_VARS']['cal_id']),
'year' =>
$this->bo->year,
'month' =>
$this->bo->month,
--- 1118,1129 ----
$date =
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day);
// if(($GLOBALS['HTTP_GET_VARS']['cal_id'] > 0) &&
($event['owner'] == $this->bo->owner) &&
$this->bo->check_perms(PHPGW_ACL_DELETE))
!
if($this->bo->check_perms(PHPGW_ACL_DELETE,$cal_id=intval($GLOBALS['HTTP_GET_VARS']['cal_id'])))
{
if(isset($GLOBALS['HTTP_POST_VARS']['delete_type']) &&
$GLOBALS['HTTP_POST_VARS']['delete_type'] == 'single')
{
$cd = $this->bo->delete_single(
Array(
! 'id' => $cal_id,
'year' =>
$this->bo->year,
'month' =>
$this->bo->month,
***************
*** 1136,1140 ****
elseif((isset($GLOBALS['HTTP_POST_VARS']['delete_type']) &&
$GLOBALS['HTTP_POST_VARS']['delete_type'] == 'series') ||
!isset($GLOBALS['HTTP_POST_VARS']['delete_type']))
{
! $cd =
$this->bo->delete_entry(intval($GLOBALS['HTTP_GET_VARS']['cal_id']));
$this->bo->expunge();
}
--- 1134,1138 ----
elseif((isset($GLOBALS['HTTP_POST_VARS']['delete_type']) &&
$GLOBALS['HTTP_POST_VARS']['delete_type'] == 'series') ||
!isset($GLOBALS['HTTP_POST_VARS']['delete_type']))
{
! $cd = $this->bo->delete_entry($cal_id);
$this->bo->expunge();
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.18,1.71.2.19 class.uicalendar.inc.php,1.66.2.27,1.66.2.28,
Ralf Becker <address@hidden> <=
- Prev by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.17,1.71.2.18 class.uicalendar.inc.php,1.66.2.26,1.66.2.27
- Next by Date:
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.28,1.66.2.29
- Previous by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.17,1.71.2.18 class.uicalendar.inc.php,1.66.2.26,1.66.2.27
- Next by thread:
[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.28,1.66.2.29
- Index(es):