[Phpgroupware-cvs] CVS: calendar/inc class.boicalendar.inc.php,1.16.2.2,1.16.2.3 class.uiicalendar.inc.php,1.3.2.1,1.3.2.2

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.boicalendar.inc.php class.uiicalendar.inc.php 
Log Message:
GNU Bug #438.  This should standardize all to use the dattime class for 
consistency.

Index: class.boicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.boicalendar.inc.php,v
retrieving revision 1.16.2.2
retrieving revision 1.16.2.3
diff -C2 -r1.16.2.2 -r1.16.2.3
*** class.boicalendar.inc.php   6 Apr 2002 15:13:20 -0000       1.16.2.2
--- class.boicalendar.inc.php   23 Jun 2002 21:24:22 -0000      1.16.2.3
***************
*** 3047,3051 ****
                                                
if(isset($ical['event'][$i][$i_datevar]))
                                                {
!                                                       $temp_time = 
$so_event->maketime($ical['event'][$i][$i_datevar]) + 
$so_event->datetime->tz_offset;
                                                        @reset($date_array);
                                                        while(list($key,$var) = 
each($date_array))
--- 3047,3051 ----
                                                
if(isset($ical['event'][$i][$i_datevar]))
                                                {
!                                                       $temp_time = 
$so_event->maketime($ical['event'][$i][$i_datevar]) + 
$GLOBALS['phpgw']->datetime->tz_offset;
                                                        @reset($date_array);
                                                        while(list($key,$var) = 
each($date_array))
***************
*** 3272,3280 ****
                                $ical_event['priority'] = $event['priority'];
                                $ical_event['class'] = intval($event['public']);
!                               $dtstart_mktime = 
$so_event->maketime($event['start']) - $so_event->datetime->tz_offset;
                                
$this->parse_value($ical_event,'dtstart',date('Ymd\THis\Z',$dtstart_mktime),'vevent');
!                               $dtend_mktime = 
$so_event->maketime($event['end']) - $so_event->datetime->tz_offset;
                                
$this->parse_value($ical_event,'dtend',date('Ymd\THis\Z',$dtend_mktime),'vevent');
!                               $mod_mktime = 
$so_event->maketime($event['modtime']) - $so_event->datetime->tz_offset;
                                
$this->parse_value($ical_event,'last_modified',date('Ymd\THis\Z',$mod_mktime),'vevent');
                                @reset($string_array);
--- 3272,3280 ----
                                $ical_event['priority'] = $event['priority'];
                                $ical_event['class'] = intval($event['public']);
!                               $dtstart_mktime = 
$so_event->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
                                
$this->parse_value($ical_event,'dtstart',date('Ymd\THis\Z',$dtstart_mktime),'vevent');
!                               $dtend_mktime = 
$so_event->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset;
                                
$this->parse_value($ical_event,'dtend',date('Ymd\THis\Z',$dtend_mktime),'vevent');
!                               $mod_mktime = 
$so_event->maketime($event['modtime']) - $GLOBALS['phpgw']->datetime->tz_offset;
                                
$this->parse_value($ical_event,'last_modified',date('Ymd\THis\Z',$mod_mktime),'vevent');
                                @reset($string_array);
***************
*** 3390,3394 ****
                                        if($event['recur_enddate']['month'] != 
0 && $event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 
0)
                                        {
!                                               $recur_mktime = 
$so_event->maketime($event['recur_enddate']) - $so_event->datetime->tz_offset;
                                                $str .= 
';UNTIL='.date('Ymd\THis\Z',$recur_mktime);
                                        }
--- 3390,3394 ----
                                        if($event['recur_enddate']['month'] != 
0 && $event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 
0)
                                        {
!                                               $recur_mktime = 
$so_event->maketime($event['recur_enddate']) - 
$GLOBALS['phpgw']->datetime->tz_offset;
                                                $str .= 
';UNTIL='.date('Ymd\THis\Z',$recur_mktime);
                                        }

Index: class.uiicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uiicalendar.inc.php,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -C2 -r1.3.2.1 -r1.3.2.2
*** class.uiicalendar.inc.php   6 Apr 2002 15:11:25 -0000       1.3.2.1
--- class.uiicalendar.inc.php   23 Jun 2002 21:24:22 -0000      1.3.2.2
***************
*** 18,22 ****
        {
                var $bo;
-               var $datetime;
                var $template;
  
--- 18,21 ----
***************
*** 31,35 ****
                {
                        $this->bo = CreateObject('calendar.boicalendar');
-                       $this->datetime = CreateObject('phpgwapi.datetime');
                        $this->template = $GLOBALS['phpgw']->template;
                }
--- 30,33 ----