[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.1,1.71.2.2

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv743/calendar/inc

Modified Files:
      Tag: Version-0_9_14-branch
        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.71.2.1
retrieving revision 1.71.2.2
diff -C2 -r1.71.2.1 -r1.71.2.2
*** class.bocalendar.inc.php    13 Apr 2002 01:31:04 -0000      1.71.2.1
--- class.bocalendar.inc.php    16 Apr 2002 16:20:13 -0000      1.71.2.2
***************
*** 215,218 ****
--- 215,229 ----
                        }
  
+                       $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 = (isset($GLOBALS['date'])?$GLOBALS['date']:'');
                        $date = 
(isset($GLOBALS['HTTP_GET_VARS']['date'])?$GLOBALS['HTTP_GET_VARS']['date']:$date);
***************
*** 242,246 ****
                                elseif($this->year == 0)
                                {
!                                       $this->year = date('Y',time());
                                }
                                if(isset($month) && $month!='')
--- 253,257 ----
                                elseif($this->year == 0)
                                {
!                                       $this->year = date('Y',$localtime);
                                }
                                if(isset($month) && $month!='')
***************
*** 250,254 ****
                                elseif($this->month == 0)
                                {
!                                       $this->month = date('m',time());
                                }
                                if(isset($day) && $day!='')
--- 261,265 ----
                                elseif($this->month == 0)
                                {
!                                       $this->month = date('m',$localtime);
                                }
                                if(isset($day) && $day!='')
***************
*** 258,276 ****
                                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 = gmdate('Ymd',time());
  
                        if($this->debug)
--- 269,277 ----
                                elseif($this->day == 0)
                                {
!                                       $this->day = date('d',$localtime);
                                }
                        }
                        
!                       $this->today = date('Ymd',$this->datetime->gmtnow);
  
                        if($this->debug)
***************
*** 397,403 ****
                                                ob_start();
                                        }
!                                       echo '<!-- '."\n".'Save:';
!                                       _debug_array($data);
!                                       echo ' -->'."\n";
                                        if(floor(phpversion()) >= 4)
                                        {
--- 398,402 ----
                                                ob_start();
                                        }
!                                       echo '<!-- 
'."\n".'Save:'."\n"._debug_array($data,False)."\n".' -->'."\n";
                                        if(floor(phpversion()) >= 4)
                                        {
***************
*** 415,421 ****
                        if($this->debug)
                        {
!                               echo '<!-- '."\n".'Read:';
!                               _debug_array($data);
!                               echo ' -->'."\n";
                        }
  
--- 414,418 ----
                        if($this->debug)
                        {
!                               echo '<!-- 
'."\n".'Read:'."\n"._debug_array($data,False)."\n".' -->'."\n";
                        }