[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.72,1.73
From: |
Mark A Peters <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.72,1.73 |
Date: |
Tue, 16 Apr 2002 12:20:24 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv766/calendar/inc
Modified Files:
class.bocalendar.inc.php
Log Message:
This part of a major fix for the calendar.
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -r1.72 -r1.73
*** class.bocalendar.inc.php 16 Mar 2002 03:01:39 -0000 1.72
--- class.bocalendar.inc.php 16 Apr 2002 16:20:22 -0000 1.73
***************
*** 139,146 ****
echo '<!-- Grantor: '.$grantor.'
Rights: '.$rights.' -->'."\n";
}
! @reset($this->grantor);
}
! if($this->debug) { echo '<!-- Read Use_Session :
('.$session.') -->'."\n"; }
if($session)
--- 139,149 ----
echo '<!-- Grantor: '.$grantor.'
Rights: '.$rights.' -->'."\n";
}
! @reset($this->grants);
}
! if($this->debug)
! {
! echo '<!-- Read Use_Session : ('.$session.')
-->'."\n";
! }
if($session)
***************
*** 193,197 ****
--- 196,212 ----
$this->filter =
get_var('filter',Array('HTTP_POST_VARS','DEFAULT'),'
'.$this->prefs['calendar']['defaultfilter'].' ');
$this->cat_id =
get_var('cat_id',Array('HTTP_POST_VARS'));
+
+ $this->so = CreateObject('calendar.socalendar',
+ Array(
+ 'owner' => $this->owner,
+ 'filter' =>
$this->filter,
+ 'category' => $this->cat_id,
+ 'g_owner' => $this->g_owner
+ )
+ );
+ $this->datetime = $this->so->datetime;
+ $localtime = $this->datetime->gmtnow +
$this->datetime->tz_offset;
+
$date =
get_var('date',Array('HTTP_GET_VARS','HTTP_POST_VARS'));
$year =
get_var('year',Array('HTTP_GET_VARS','HTTP_POST_VARS'));
***************
*** 213,217 ****
elseif($this->year == 0)
{
! $this->year = date('Y',time());
}
if(isset($month) && $month!='')
--- 228,232 ----
elseif($this->year == 0)
{
! $this->year = date('Y',$localtime);
}
if(isset($month) && $month!='')
***************
*** 221,225 ****
elseif($this->month == 0)
{
! $this->month = date('m',time());
}
if(isset($day) && $day!='')
--- 236,240 ----
elseif($this->month == 0)
{
! $this->month = date('m',$localtime);
}
if(isset($day) && $day!='')
***************
*** 229,247 ****
elseif($this->day == 0)
{
! $this->day = date('d',time());
}
}
!
! $this->so = CreateObject('calendar.socalendar',
! Array(
! 'owner' => $this->owner,
! 'filter' =>
$this->filter,
! 'category' => $this->cat_id,
! 'g_owner' => $this->g_owner
! )
! );
! $this->datetime = $this->so->datetime;
!
! $this->today = date('Ymd',time());
if($this->debug)
--- 244,252 ----
elseif($this->day == 0)
{
! $this->day = date('d',$localtime);
}
}
!
! $this->today = date('Ymd',$this->datetime->gmtnow);
if($this->debug)
***************
*** 355,359 ****
if ($this->use_session)
{
! if($this->debug) { echo '<br>Save:';
_debug_array($data); }
$GLOBALS['phpgw']->session->appsession('session_data','calendar',$data);
}
--- 360,367 ----
if ($this->use_session)
{
! if($this->debug)
! {
! echo '<!--
'."\n".'Save:'."\n"._debug_array($data,False)."\n".' -->'."\n";
! }
$GLOBALS['phpgw']->session->appsession('session_data','calendar',$data);
}
***************
*** 363,368 ****
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data','calendar');
! if($this->debug) { echo '<br>Read:';
_debug_array($data); }
!
$this->filter = $data['filter'];
$this->cat_id = $data['cat_id'];
--- 371,379 ----
{
$data =
$GLOBALS['phpgw']->session->appsession('session_data','calendar');
! if($this->debug)
! {
! echo '<!--
'."\n".'Read:'."\n"._debug_array($data,False)."\n".' -->'."\n";
! }
!
$this->filter = $data['filter'];
$this->cat_id = $data['cat_id'];
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.72,1.73,
Mark A Peters <address@hidden> <=