[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.75,1.76
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.75,1.76 class.boicalendar.inc.php,1.18,1.19 class.socalendar.inc.php,1.23,1.24 class.socalendar__.inc.php,1.11,1.12 class.socalendar_sql.inc.php,1.28,1.29 class.uicalendar.inc.php,1.78,1.79 class.uiicalendar.inc.php,1.4,1.5 |
|
Date: |
Mon, 24 Jun 2002 19:24:26 -0400 |
Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv1976
Modified Files:
class.bocalendar.inc.php class.boicalendar.inc.php
class.socalendar.inc.php class.socalendar__.inc.php
class.socalendar_sql.inc.php class.uicalendar.inc.php
class.uiicalendar.inc.php
Log Message:
GNU Bug #438 and GNU Bug #745.
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -r1.75 -r1.76
*** class.bocalendar.inc.php 5 May 2002 17:47:15 -0000 1.75
--- class.bocalendar.inc.php 24 Jun 2002 23:24:24 -0000 1.76
***************
*** 98,102 ****
var $cached_events;
var $repeating_events;
- var $datetime;
var $day;
var $month;
--- 98,101 ----
***************
*** 204,209 ****
)
);
! $this->datetime = $this->so->datetime;
! $localtime = $this->datetime->gmtnow +
$this->datetime->tz_offset;
$date =
get_var('date',Array('HTTP_GET_VARS','HTTP_POST_VARS'));
--- 203,207 ----
)
);
! $localtime =
$GLOBALS['phpgw']->datetme->users_localtime;
$date =
get_var('date',Array('HTTP_GET_VARS','HTTP_POST_VARS'));
***************
*** 226,230 ****
elseif($this->year == 0)
{
! $this->year = date('Y',$localtime);
}
if(isset($month) && $month!='')
--- 224,228 ----
elseif($this->year == 0)
{
! $this->year =
date('Y',$GLOBALS['phpgw']->datetme->users_localtime);
}
if(isset($month) && $month!='')
***************
*** 234,238 ****
elseif($this->month == 0)
{
! $this->month = date('m',$localtime);
}
if(isset($day) && $day!='')
--- 232,236 ----
elseif($this->month == 0)
{
! $this->month =
date('m',$GLOBALS['phpgw']->datetme->users_localtime);
}
if(isset($day) && $day!='')
***************
*** 242,250 ****
elseif($this->day == 0)
{
! $this->day = date('d',$localtime);
}
}
! $this->today = date('Ymd',$this->datetime->gmtnow);
if($this->debug)
--- 240,248 ----
elseif($this->day == 0)
{
! $this->day =
date('d',$GLOBALS['phpgw']->datetme->users_localtime);
}
}
! $this->today =
date('Ymd',$GLOBALS['phpgw']->datetime->gmtnow);
if($this->debug)
***************
*** 406,410 ****
if($this->owner == $event['owner'])
{
! $exception_time =
mktime($event['start']['hour'],$event['start']['min'],0,$param['month'],$param['day'],$param['year'])
- $this->datetime->tz_offset;
$event['recur_exception'][] =
intval($exception_time);
$this->so->cal->event = $event;
--- 404,408 ----
if($this->owner == $event['owner'])
{
! $exception_time =
mktime($event['start']['hour'],$event['start']['min'],0,$param['month'],$param['day'],$param['year'])
- $GLOBALS['phpgw']->datetime->tz_offset;
$event['recur_exception'][] =
intval($exception_time);
$this->so->cal->event = $event;
***************
*** 911,925 ****
$error = 40;
}
! elseif
(($this->datetime->time_valid($event['start']['hour'],$event['start']['min'],0)
== False) ||
($this->datetime->time_valid($event['end']['hour'],$event['end']['min'],0) ==
False))
{
$error = 41;
}
! elseif
(($this->datetime->date_valid($event['start']['year'],$event['start']['month'],$event['start']['mday'])
== False) ||
($this->datetime->date_valid($event['end']['year'],$event['end']['month'],$event['end']['mday'])
== False) ||
($this->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday'])
== 1))
{
$error = 42;
}
! elseif
($this->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday'])
== 0)
{
! if
($this->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0)
== 1)
{
$error = 42;
--- 909,923 ----
$error = 40;
}
! elseif
(($GLOBALS['phpgw']->datetime->time_valid($event['start']['hour'],$event['start']['min'],0)
== False) ||
($GLOBALS['phpgw']->datetime->time_valid($event['end']['hour'],$event['end']['min'],0)
== False))
{
$error = 41;
}
! elseif
(($GLOBALS['phpgw']->datetime->date_valid($event['start']['year'],$event['start']['month'],$event['start']['mday'])
== False) ||
($GLOBALS['phpgw']->datetime->date_valid($event['end']['year'],$event['end']['month'],$event['end']['mday'])
== False) ||
($GLOBALS['phpgw']->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday'])
== 1))
{
$error = 42;
}
! elseif
($GLOBALS['phpgw']->datetime->date_compare($event['start']['year'],$event['start']['month'],$event['start']['mday'],$event['end']['year'],$event['end']['month'],$event['end']['mday'])
== 0)
{
! if
($GLOBALS['phpgw']->datetime->time_compare($event['start']['hour'],$event['start']['min'],0,$event['end']['hour'],$event['end']['min'],0)
== 1)
{
$error = 42;
***************
*** 1059,1063 ****
// if($starttime == $endtime &&
$GLOBALS['phpgw']->common->show_date($starttime,'Hi') == 0)
// {
! // $endtime =
mktime(23,59,59,$GLOBALS['phpgw']->common->show_date($starttime,'m'),$GLOBALS['phpgw']->common->show_date($starttime,'d')
+ 1,$GLOBALS['phpgw']->common->show_date($starttime,'Y')) -
$this->datetime->tz_offset;
// }
//
--- 1057,1061 ----
// if($starttime == $endtime &&
$GLOBALS['phpgw']->common->show_date($starttime,'Hi') == 0)
// {
! // $endtime =
mktime(23,59,59,$GLOBALS['phpgw']->common->show_date($starttime,'m'),$GLOBALS['phpgw']->common->show_date($starttime,'d')
+ 1,$GLOBALS['phpgw']->common->show_date($starttime,'Y')) -
$GLOBALS['phpgw']->datetime->tz_offset;
// }
//
***************
*** 1250,1255 ****
function get_week_label()
{
! $first =
$this->datetime->gmtdate($this->datetime->get_weekday_start($this->year,
$this->month, $this->day));
! $last = $this->datetime->gmtdate($first['raw'] +
518400);
// Week Label
--- 1248,1253 ----
function get_week_label()
{
! $first =
$GLOBALS['phpgw']->datetime->gmtdate($GLOBALS['phpgw']->datetime->get_weekday_start($this->year,
$this->month, $this->day));
! $last =
$GLOBALS['phpgw']->datetime->gmtdate($first['raw'] + 518400);
// Week Label
***************
*** 1353,1357 ****
if(isset($event['recur_exception']))
{
! $event_time =
mktime($event['start']['hour'],$event['start']['min'],0,intval(substr($date,4,2)),intval(substr($date,6,2)),intval(substr($date,0,4)))
- $this->datetime->tz_offset;
while($inserted == False &&
list($key,$exception_time) = each($event['recur_exception']))
{
--- 1351,1355 ----
if(isset($event['recur_exception']))
{
! $event_time =
mktime($event['start']['hour'],$event['start']['min'],0,intval(substr($date,4,2)),intval(substr($date,6,2)),intval(substr($date,0,4)))
- $GLOBALS['phpgw']->datetime->tz_offset;
while($inserted == False &&
list($key,$exception_time) = each($event['recur_exception']))
{
***************
*** 1541,1545 ****
}
! if
(($this->datetime->day_of_week($rep_events['start']['year'],$rep_events['start']['month'],$rep_events['start']['mday'])
==
$this->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day))
&&
(ceil($rep_events['start']['mday']/7) == ceil($search_date_day/7)))
{
--- 1539,1543 ----
}
! if
(($GLOBALS['phpgw']->datetime->day_of_week($rep_events['start']['year'],$rep_events['start']['month'],$rep_events['start']['mday'])
==
$GLOBALS['phpgw']->datetime->day_of_week($search_date_year,$search_date_month,$search_date_day))
&&
(ceil($rep_events['start']['mday']/7) == ceil($search_date_day/7)))
{
***************
*** 1706,1711 ****
}
}
! // $edate -= $this->datetime->tz_offset;
! // for($date=mktime(0,0,0,$smonth,$sday,$syear) -
$this->datetime->tz_offset;$date<=$edate;$date += 86400)
for($date=mktime(0,0,0,$smonth,$sday,$syear);$date<=$edate;$date += 86400)
{
--- 1704,1709 ----
}
}
! // $edate -=
$GLOBALS['phpgw']->datetime->tz_offset;
! // for($date=mktime(0,0,0,$smonth,$sday,$syear) -
$GLOBALS['phpgw']->datetime->tz_offset;$date<=$edate;$date += 86400)
for($date=mktime(0,0,0,$smonth,$sday,$syear);$date<=$edate;$date += 86400)
{
***************
*** 1850,1855 ****
{
$event = $this->cached_events[$fulldate][$k];
! $eventstart =
$this->datetime->localdates($this->maketime($event['start']) -
$this->datetime->tz_offset);
! $eventend =
$this->datetime->localdates($this->maketime($event['end']) -
$this->datetime->tz_offset);
$start = ($eventstart['hour'] * 10000) +
($eventstart['minute'] * 100);
$starttemp = $this->splittime("$start",False);
--- 1848,1853 ----
{
$event = $this->cached_events[$fulldate][$k];
! $eventstart =
$GLOBALS['phpgw']->datetime->localdates($this->maketime($event['start']) -
$GLOBALS['phpgw']->datetime->tz_offset);
! $eventend =
$GLOBALS['phpgw']->datetime->localdates($this->maketime($event['end']) -
$GLOBALS['phpgw']->datetime->tz_offset);
$start = ($eventstart['hour'] * 10000) +
($eventstart['minute'] * 100);
$starttemp = $this->splittime("$start",False);
***************
*** 2014,2023 ****
if($old_event != False)
{
! $old_event_datetime = $t_old_start_time -
$this->datetime->tz_offset;
}
if($new_event != False)
{
! $new_event_datetime =
$this->maketime($new_event['start']) - $this->datetime->tz_offset;
}
--- 2012,2021 ----
if($old_event != False)
{
! $old_event_datetime = $t_old_start_time -
$GLOBALS['phpgw']->datetime->tz_offset;
}
if($new_event != False)
{
! $new_event_datetime =
$this->maketime($new_event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
}
***************
*** 2128,2132 ****
$t_appt['min'] =
$GLOBALS['phpgw']->common->show_date($starttime,'i');
$t_appt['sec'] = 0;
! $t_time = $this->maketime($t_appt) -
$this->datetime->tz_offset;
$y_time = $t_time - 86400;
$tt_time = $t_time + 86399;
--- 2126,2130 ----
$t_appt['min'] =
$GLOBALS['phpgw']->common->show_date($starttime,'i');
$t_appt['sec'] = 0;
! $t_time = $this->maketime($t_appt) -
$GLOBALS['phpgw']->datetime->tz_offset;
$y_time = $t_time - 86400;
$tt_time = $t_time + 86399;
Index: class.boicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.boicalendar.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** class.boicalendar.inc.php 6 Apr 2002 15:13:51 -0000 1.18
--- class.boicalendar.inc.php 24 Jun 2002 23:24:24 -0000 1.19
***************
*** 1252,1255 ****
--- 1252,1259 ----
)
);
+ if(!is_object($GLOBALS['phpgw']->datetime))
+ {
+ $GLOBALS['phpgw']->datetime =
createobject('phpgwaqpi.datetime');
+ }
}
***************
*** 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))
--- 3051,3055 ----
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);
--- 3276,3284 ----
$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);
}
--- 3394,3398 ----
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.socalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.socalendar.inc.php 7 Feb 2002 02:14:20 -0000 1.23
--- class.socalendar.inc.php 24 Jun 2002 23:24:24 -0000 1.24
***************
*** 24,28 ****
var $g_owner;
var $is_group = False;
- var $datetime;
var $filter;
var $cat_id;
--- 24,27 ----
***************
*** 31,35 ****
{
$this->db = $GLOBALS['phpgw']->db;
! $this->datetime = CreateObject('phpgwapi.datetime');
$this->owner = (!isset($param['owner']) ||
$param['owner'] ==
0?$GLOBALS['phpgw_info']['user']['account_id']:$param['owner']);
--- 30,37 ----
{
$this->db = $GLOBALS['phpgw']->db;
! if(!is_object($GLOBALS['phpgw']->datetime))
! {
! $GLOBALS['phpgw']->datetime =
createobject('phpgwapi.datetime');
! }
$this->owner = (!isset($param['owner']) ||
$param['owner'] ==
0?$GLOBALS['phpgw_info']['user']['account_id']:$param['owner']);
***************
*** 47,51 ****
}
$this->cal = CreateObject('calendar.socalendar_');
! $this->cal->open('INBOX',intval($this->owner));
}
--- 49,58 ----
}
$this->cal = CreateObject('calendar.socalendar_');
! $this->open_box($this->owner);
! }
!
! function open_box($owner)
! {
! $this->cal->open('INBOX',intval($owner));
}
***************
*** 67,75 ****
if($owner_id)
{
! return
$this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,$this->datetime->tz_offset,$owner_id);
}
else
{
! return
$this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,$this->datetime->tz_offset);
}
}
--- 74,82 ----
if($owner_id)
{
! return
$this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,$GLOBALS['phpgw']->datetime->tz_offset,$owner_id);
}
else
{
! return
$this->cal->list_events($startYear,$startMonth,$startDay,$endYear,$endMonth,$endDay,$extra,$GLOBALS['phpgw']->datetime->tz_offset);
}
}
***************
*** 82,87 ****
}
! $starttime = mktime(0,0,0,$smonth,$sday,$syear) -
$this->datetime->tz_offset;
! $endtime = mktime(23,59,59,$emonth,$eday,$eyear) -
$this->datetime->tz_offset;
// $starttime = mktime(0,0,0,$smonth,$sday,$syear);
// $endtime = mktime(23,59,59,$emonth,$eday,$eyear);
--- 89,94 ----
}
! $starttime = mktime(0,0,0,$smonth,$sday,$syear) -
$GLOBALS['phpgw']->datetime->tz_offset;
! $endtime = mktime(23,59,59,$emonth,$eday,$eyear) -
$GLOBALS['phpgw']->datetime->tz_offset;
// $starttime = mktime(0,0,0,$smonth,$sday,$syear);
// $endtime = mktime(23,59,59,$emonth,$eday,$eyear);
Index: class.socalendar__.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar__.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** class.socalendar__.inc.php 18 Nov 2001 23:01:09 -0000 1.11
--- class.socalendar__.inc.php 24 Jun 2002 23:24:24 -0000 1.12
***************
*** 64,68 ****
var $user;
var $users_status;
- var $datetime;
var $debug = False;
// var $debug = True;
--- 64,67 ----
***************
*** 70,74 ****
function socalendar__()
{
! $this->datetime = CreateObject('phpgwapi.datetime');
}
--- 69,76 ----
function socalendar__()
{
! if(!is_object($GLOBALS['phpgw']->datetime))
! {
! $GLOBALS['phpgw']->datetime =
createobject('phpgwapi.datetime');
! }
}
Index: class.socalendar_sql.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** class.socalendar_sql.inc.php 10 Jan 2002 02:15:33 -0000 1.28
--- class.socalendar_sql.inc.php 24 Jun 2002 23:24:24 -0000 1.29
***************
*** 130,140 ****
//Legacy Support (New)
! $datetime =
$this->datetime->localdates($this->stream->f('datetime'));
$this->set_start($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
! $datetime =
$this->datetime->localdates($this->stream->f('mdatetime'));
$this->set_date('modtime',$datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
! $datetime =
$this->datetime->localdates($this->stream->f('edatetime'));
$this->set_end($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
--- 130,140 ----
//Legacy Support (New)
! $datetime =
$GLOBALS['phpgw']->datetime->localdates($this->stream->f('datetime'));
$this->set_start($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
! $datetime =
$GLOBALS['phpgw']->datetime->localdates($this->stream->f('mdatetime'));
$this->set_date('modtime',$datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
! $datetime =
$GLOBALS['phpgw']->datetime->localdates($this->stream->f('edatetime'));
$this->set_end($datetime['year'],$datetime['month'],$datetime['day'],$datetime['hour'],$datetime['minute'],$datetime['second']);
***************
*** 160,164 ****
if($enddate != 0 && $enddate != Null)
{
! $datetime =
$this->datetime->localdates($enddate);
$this->add_attribute('recur_enddate',$datetime['year'],'year');
$this->add_attribute('recur_enddate',$datetime['month'],'month');
--- 160,164 ----
if($enddate != 0 && $enddate != Null)
{
! $datetime =
$GLOBALS['phpgw']->datetime->localdates($enddate);
$this->add_attribute('recur_enddate',$datetime['year'],'year');
$this->add_attribute('recur_enddate',$datetime['month'],'month');
***************
*** 460,466 ****
}
! $date = $this->maketime($event['start']) -
$this->datetime->tz_offset;
! $enddate = $this->maketime($event['end']) -
$this->datetime->tz_offset;
! $today = time() - $this->datetime->tz_offset;
if($event['recur_type'] != MCAL_RECUR_NONE)
--- 460,466 ----
}
! $date = $this->maketime($event['start']) -
$GLOBALS['phpgw']->datetime->tz_offset;
! $enddate = $this->maketime($event['end']) -
$GLOBALS['phpgw']->datetime->tz_offset;
! $today = time() - $GLOBALS['phpgw']->datetime->tz_offset;
if($event['recur_type'] != MCAL_RECUR_NONE)
***************
*** 508,512 ****
if($event['recur_enddate']['month'] != 0 &&
$event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 0)
{
! $end = $this->maketime($event['recur_enddate'])
- $this->datetime->tz_offset;
}
else
--- 508,512 ----
if($event['recur_enddate']['month'] != 0 &&
$event['recur_enddate']['mday'] != 0 && $event['recur_enddate']['year'] != 0)
{
! $end = $this->maketime($event['recur_enddate'])
- $GLOBALS['phpgw']->datetime->tz_offset;
}
else
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -C2 -r1.78 -r1.79
*** class.uicalendar.inc.php 5 May 2002 17:47:15 -0000 1.78
--- class.uicalendar.inc.php 24 Jun 2002 23:24:24 -0000 1.79
***************
*** 30,36 ****
var $cat_id;
- var $datetime;
- var $tz_offset;
var $theme;
var $public_functions = array(
--- 30,35 ----
var $cat_id;
var $theme;
+ var $link_tpl;
var $public_functions = array(
***************
*** 69,74 ****
$this->bo = CreateObject('calendar.bocalendar',1);
- $this->datetime = $this->bo->datetime;
- $this->tz_offset = $this->datetime->tz_offset;
if($this->debug)
--- 68,71 ----
***************
*** 85,88 ****
--- 82,98 ----
$this->cat_id = $this->bo->cat_id;
+ $this->link_tpl =
CreateObject('phpgwapi.Template',$this->template_dir);
+ $this->link_tpl->set_unknowns('remove');
+ $this->link_tpl->set_file(
+ Array(
+ 'link_picture' => 'link_pict.tpl'
+ )
+ );
+
$this->link_tpl->set_block('link_picture','link_pict','link_pict');
+
$this->link_tpl->set_block('link_picture','pict','pict');
+
$this->link_tpl->set_block('link_picture','link_open','link_open');
+
$this->link_tpl->set_block('link_picture','link_close','link_close');
+
$this->link_tpl->set_block('link_picture','link_text','link_text');
+
if($this->bo->use_session)
{
***************
*** 130,134 ****
$this->bo->read_holidays($params['year']);
! $date =
$this->datetime->makegmttime(0,0,0,$params['month'],$params['day'],$params['year']);
$month_ago =
intval(date('Ymd',mktime(0,0,0,$params['month'] -
1,$params['day'],$params['year'])));
$month_ahead =
intval(date('Ymd',mktime(0,0,0,$params['month'] +
1,$params['day'],$params['year'])));
--- 140,144 ----
$this->bo->read_holidays($params['year']);
! $date =
$GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$params['month'],$params['day'],$params['year']);
$month_ago =
intval(date('Ymd',mktime(0,0,0,$params['month'] -
1,$params['day'],$params['year'])));
$month_ahead =
intval(date('Ymd',mktime(0,0,0,$params['month'] +
1,$params['day'],$params['year'])));
***************
*** 136,140 ****
$monthend =
intval(date('Ymd',mktime(0,0,0,$params['month'] + 1,0,$params['year'])));
! $weekstarttime =
$this->datetime->get_weekday_start($params['year'],$params['month'],1);
if($this->debug)
--- 146,150 ----
$monthend =
intval(date('Ymd',mktime(0,0,0,$params['month'] + 1,0,$params['year'])));
! $weekstarttime =
$GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],1);
if($this->debug)
***************
*** 207,221 ****
{
$var = Array(
! 'dayname' => '<b>' .
substr(lang($this->datetime->days[$i]['name']),0,2) . '</b>',
'day_image' => ''
);
$this->output_template_array($p,'daynames','mini_day',$var);
}
! $today = date('Ymd',$this->datetime->gmtnow +
$this->tz_offset);
unset($date);
! for($i=$weekstarttime +
$this->tz_offset;date('Ymd',$i)<=$monthend;$i += (24 * 3600 * 7))
{
unset($var);
! $daily = $this->set_week_array($i -
$this->tz_offset,$cellcolor,$weekly);
@reset($daily);
while(list($date,$day_params) = each($daily))
--- 217,231 ----
{
$var = Array(
! 'dayname' => '<b>' .
substr(lang($GLOBALS['phpgw']->datetime->days[$i]['name']),0,2) . '</b>',
'day_image' => ''
);
$this->output_template_array($p,'daynames','mini_day',$var);
}
! $today = date('Ymd',$GLOBALS['phpgw']->datetime->gmtnow
+ $GLOBALS['phpgw']->datetme->tz_offset);
unset($date);
! for($i=$weekstarttime +
$GLOBALS['phpgw']->datetme->tz_offset;date('Ymd',$i)<=$monthend;$i += (24 *
3600 * 7))
{
unset($var);
! $daily = $this->set_week_array($i -
$GLOBALS['phpgw']->datetme->tz_offset,$cellcolor,$weekly);
@reset($daily);
while(list($date,$day_params) = each($daily))
***************
*** 381,386 ****
$this->bo->read_holidays();
! $next =
$this->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day +
7,$this->bo->year);
! $prev =
$this->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day -
7,$this->bo->year);
if (!$this->bo->printer_friendly ||
($this->bo->printer_friendly &&
@$this->bo->prefs['calendar']['display_minicals']))
--- 391,396 ----
$this->bo->read_holidays();
! $next =
$GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day
+ 7,$this->bo->year);
! $prev =
$GLOBALS['phpgw']->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day
- 7,$this->bo->year);
if (!$this->bo->printer_friendly ||
($this->bo->printer_friendly &&
@$this->bo->prefs['calendar']['display_minicals']))
***************
*** 504,509 ****
}
! $now = $this->datetime->makegmttime(0, 0, 0,
$this->bo->month, $this->bo->day, $this->bo->year);
! $now['raw'] += $this->tz_offset;
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
--- 514,519 ----
}
! $now = $GLOBALS['phpgw']->datetime->makegmttime(0,
0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
! $now['raw'] += $GLOBALS['phpgw']->datetme->tz_offset;
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
***************
*** 645,649 ****
$this->bo->cached_events = Array();
$this->bo->repeating_events[0] = $event;
! $datetime =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$this->tz_offset;
$this->bo->check_repeating_events($datetime);
$check_date =
$GLOBALS['phpgw']->common->show_date($datetime,'Ymd');
--- 655,659 ----
$this->bo->cached_events = Array();
$this->bo->repeating_events[0] = $event;
! $datetime =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$GLOBALS['phpgw']->datetme->tz_offset;
$this->bo->check_repeating_events($datetime);
$check_date =
$GLOBALS['phpgw']->common->show_date($datetime,'Ymd');
***************
*** 1152,1157 ****
}
! $now = $this->datetime->makegmttime(0, 0, 0,
$this->bo->month, $this->bo->day, $this->bo->year);
! $now['raw'] += $this->tz_offset;
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
--- 1162,1167 ----
}
! $now = $GLOBALS['phpgw']->datetime->makegmttime(0,
0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
! $now['raw'] += $GLOBALS['phpgw']->datetme->tz_offset;
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
***************
*** 1210,1214 ****
}
! $freetime =
$this->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
- $this->tz_offset);
echo $this->timematrix(
Array(
--- 1220,1224 ----
}
! $freetime =
$GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
- $GLOBALS['phpgw']->datetme->tz_offset);
echo $this->timematrix(
Array(
***************
*** 1269,1275 ****
);
! $startdate =
mktime(0,0,0,$this->bo->month,1,$this->bo->year) - $this->tz_offset;
! $days =
$this->datetime->days_in_month($this->bo->month,$this->bo->year);
! $enddate =
mktime(23,59,59,$this->bo->month,$this->bo->days,$this->bo->year) -
$this->tz_offset;
$header[] = lang(\'Category\');
--- 1279,1285 ----
);
! $startdate =
mktime(0,0,0,$this->bo->month,1,$this->bo->year) -
$GLOBALS[\'phpgw\']->datetme->tz_offset;
! $days =
$GLOBALS[\'phpgw\']->datetime->days_in_month($this->bo->month,$this->bo->year);
! $enddate =
mktime(23,59,59,$this->bo->month,$this->bo->days,$this->bo->year) -
$GLOBALS[\'phpgw\']->datetme->tz_offset;
$header[] = lang(\'Category\');
***************
*** 1437,1441 ****
function matrixselect()
{
! $datetime =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$this->tz_offset;
$sb = CreateObject('phpgwapi.sbox');
--- 1447,1451 ----
function matrixselect()
{
! $datetime =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$GLOBALS['phpgw']->datetme->tz_offset;
$sb = CreateObject('phpgwapi.sbox');
***************
*** 1600,1604 ****
{
case 'free/busy':
! $freetime =
$this->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year));
echo $this->timematrix(
Array(
--- 1610,1614 ----
{
case 'free/busy':
! $freetime =
$GLOBALS['phpgw']->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year));
echo $this->timematrix(
Array(
***************
*** 1673,1677 ****
$event = $this->bo->read_entry($id);
! $datetime =
$this->bo->maketime($event['start']) - $this->tz_offset;
$ids[strval($event['id'])]++;
--- 1683,1687 ----
$event = $this->bo->read_entry($id);
! $datetime =
$this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetme->tz_offset;
$ids[strval($event['id'])]++;
***************
*** 1867,1872 ****
unset($thisdate);
! $thisdate =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$this->tz_offset;
! $sun =
$this->datetime->get_weekday_start($this->bo->year,$this->bo->month,$this->bo->day)
- $this->tz_offset;
$str = '';
--- 1877,1882 ----
unset($thisdate);
! $thisdate =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$GLOBALS['phpgw']->datetme->tz_offset;
! $sun =
$GLOBALS['phpgw']->datetime->get_weekday_start($this->bo->year,$this->bo->month,$this->bo->day)
- $GLOBALS['phpgw']->datetme->tz_offset;
$str = '';
***************
*** 1971,1992 ****
$is_private =
$this->bo->is_private($event,$event['owner']);
$editable = ((!$this->bo->printer_friendly) &&
(($is_private && $this->bo->check_perms(PHPGW_ACL_PRIVATE)) || !$is_private));
- $p =
CreateObject('phpgwapi.Template',$this->template_dir);
- $p->set_unknowns('remove');
- $p->set_file(
- Array(
- 'link_picture' => 'link_pict.tpl'
- )
- );
- $p->set_block('link_picture','link_pict','link_pict');
- $p->set_block('link_picture','pict','pict');
- $p->set_block('link_picture','link_open','link_open');
- $p->set_block('link_picture','link_close','link_close');
- $p->set_block('link_picture','link_text','link_text');
! $starttime = $this->bo->maketime($event['start']) -
$this->tz_offset;
! $endtime = $this->bo->maketime($event['end']) -
$this->tz_offset;
$rawdate = mktime(0,0,0,$month,$day,$year);
! $rawdate_offset = $rawdate - $this->tz_offset;
! $nextday = mktime(0,0,0,$month,$day + 1,$year) -
$this->tz_offset;
if
(intval($GLOBALS['phpgw']->common->show_date($starttime,'Hi')) && $starttime ==
$endtime)
{
--- 1981,1990 ----
$is_private =
$this->bo->is_private($event,$event['owner']);
$editable = ((!$this->bo->printer_friendly) &&
(($is_private && $this->bo->check_perms(PHPGW_ACL_PRIVATE)) || !$is_private));
! $starttime = $this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetme->tz_offset;
! $endtime = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$rawdate = mktime(0,0,0,$month,$day,$year);
! $rawdate_offset = $rawdate -
$GLOBALS['phpgw']->datetme->tz_offset;
! $nextday = mktime(0,0,0,$month,$day + 1,$year) -
$GLOBALS['phpgw']->datetme->tz_offset;
if
(intval($GLOBALS['phpgw']->common->show_date($starttime,'Hi')) && $starttime ==
$endtime)
{
***************
*** 2010,2014 ****
if($endtime >= ($rawdate_offset + 86400))
{
! $end_time =
$GLOBALS['phpgw']->common->show_date(mktime(23,59,59,$month,$day,$year) -
$this->tz_offset,$this->bo->users_timeformat);
}
else
--- 2008,2012 ----
if($endtime >= ($rawdate_offset + 86400))
{
! $end_time =
$GLOBALS['phpgw']->common->show_date(mktime(23,59,59,$month,$day,$year) -
$GLOBALS['phpgw']->datetme->tz_offset,$this->bo->users_timeformat);
}
else
***************
*** 2032,2038 ****
{
$date =
sprintf('%04d%02d%02d',$year,$month,$day);
!
$p->set_var('link_link',$this->page('view','&cal_id='.$event['id'].'&date='.$date));
! $p->set_var('lang_view',lang('View this
entry'));
! $p->parse('picture','link_open',True);
if($event['priority'] == 3)
--- 2030,2036 ----
{
$date =
sprintf('%04d%02d%02d',$year,$month,$day);
!
$this->link_tpl->set_var('link_link',$this->page('view','&cal_id='.$event['id'].'&date='.$date));
! $this->link_tpl->set_var('lang_view',lang('View
this entry'));
!
$this->link_tpl->parse('picture','link_open',True);
if($event['priority'] == 3)
***************
*** 2097,2101 ****
'description' => $description
);
!
$this->output_template_array($p,'picture','pict',$var);
}
}
--- 2095,2099 ----
'description' => $description
);
!
$this->output_template_array($this->link_tpl,'picture','pict',$var);
}
}
***************
*** 2109,2121 ****
'text' => $text
);
!
$this->output_template_array($p,'picture','link_text',$var);
}
if ($editable)
{
! $p->parse('picture','link_close',True);
}
! $str = $p->fp('out','link_pict');
! unset($p);
return $str;
}
--- 2107,2121 ----
'text' => $text
);
!
$this->output_template_array($this->link_tpl,'picture','link_text',$var);
}
if ($editable)
{
!
$this->link_tpl->parse('picture','link_close',True);
}
! $str = $this->link_tpl->fp('out','link_pict');
! $this->link_tpl->set_var('picture','');
! $this->link_tpl->set_var('out','');
! // unset($p);
return $str;
}
***************
*** 2136,2141 ****
$year = $event['start']['year'];
! $start =
mktime($event['start']['hour'],$event['start']['min'],$event['start']['sec'],$month,$mday,$year)
- $this->tz_offset;
! $end = $this->bo->maketime($event['end']) -
$this->tz_offset;
$overlap = '';
--- 2136,2141 ----
$year = $event['start']['year'];
! $start =
mktime($event['start']['hour'],$event['start']['min'],$event['start']['sec'],$month,$mday,$year)
- $GLOBALS['phpgw']->datetme->tz_offset;
! $end = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$overlap = '';
***************
*** 2242,2246 ****
function week_header($month,$year,$display_name = False)
{
! $this->weekstarttime =
$this->datetime->get_weekday_start($year,$month,1);
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
--- 2242,2246 ----
function week_header($month,$year,$display_name = False)
{
! $this->weekstarttime =
$GLOBALS['phpgw']->datetime->get_weekday_start($year,$month,1);
$p =
CreateObject('phpgwapi.Template',$this->template_dir);
***************
*** 2276,2280 ****
}
! if($this->datetime->days[$i]['weekday'])
{
switch($col_width)
--- 2276,2280 ----
}
! if($GLOBALS['phpgw']->datetime->days[$i]['weekday'])
{
switch($col_width)
***************
*** 2293,2299 ****
for($i=0;$i<7;$i++)
{
!
if($this->bo->prefs['calendar']['weekdays_only'] &&
$this->datetime->days[$i]['weekday'])
{
!
$p->set_var('col_title',lang($this->datetime->days[$i]['name']));
$p->parse('column_header','column_title',True);
}
--- 2293,2299 ----
for($i=0;$i<7;$i++)
{
!
if($this->bo->prefs['calendar']['weekdays_only'] &&
$GLOBALS['phpgw']->datetime->days[$i]['weekday'])
{
!
$p->set_var('col_title',lang($GLOBALS['phpgw']->datetime->days[$i]['name']));
$p->parse('column_header','column_title',True);
}
***************
*** 2310,2314 ****
$temp_owner = $this->bo->owner;
! $this->bo->owner = $owner;
$str = '';
--- 2310,2314 ----
$temp_owner = $this->bo->owner;
! // $this->bo->owner = $owner;
$str = '';
***************
*** 2336,2341 ****
$p->set_var('col_width','12');
}
! $today = date('Ymd',$this->datetime->gmtnow +
$this->tz_offset);
! $daily = $this->set_week_array($startdate -
$this->tz_offset,$cellcolor,$weekly);
@reset($daily);
while(list($date,$day_params) = each($daily))
--- 2336,2341 ----
$p->set_var('col_width','12');
}
! $today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
! $daily = $this->set_week_array($startdate -
$GLOBALS['phpgw']->datetme->tz_offset,$cellcolor,$weekly);
@reset($daily);
while(list($date,$day_params) = each($daily))
***************
*** 2344,2348 ****
$month = intval(substr($date,4,2));
$day = intval(substr($date,6,2));
! $dow =
$this->datetime->day_of_week($year,$month,$day);
if($this->bo->prefs['calendar']['weekdays_only'] && ($dow == 0 || $dow == 6))
{
--- 2344,2348 ----
$month = intval(substr($date,4,2));
$day = intval(substr($date,6,2));
! $dow =
$GLOBALS['phpgw']->datetime->day_of_week($year,$month,$day);
if($this->bo->prefs['calendar']['weekdays_only'] && ($dow == 0 || $dow == 6))
{
***************
*** 2431,2435 ****
if($this->debug)
{
! echo '<!-- datetime:gmtdate =
'.$this->datetime->cv_gmtdate.' -->'."\n";
}
--- 2431,2435 ----
if($this->debug)
{
! echo '<!-- datetime:gmtdate =
'.$GLOBALS['phpgw']->datetime->cv_gmtdate.' -->'."\n";
}
***************
*** 2445,2449 ****
$monthend = intval(date('Ymd',mktime(0,0,0,$month +
1,0,$year)));
! $start = $this->datetime->get_weekday_start($year,
$month, 1);
if($this->debug)
--- 2445,2449 ----
$monthend = intval(date('Ymd',mktime(0,0,0,$month +
1,0,$year)));
! $start =
$GLOBALS['phpgw']->datetime->get_weekday_start($year, $month, 1);
if($this->debug)
***************
*** 2473,2477 ****
$cellcolor = $this->theme['row_on'];
! for ($i=intval($start +
$this->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i += 604800)
{
$cellcolor =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
--- 2473,2477 ----
$cellcolor = $this->theme['row_on'];
! for ($i=intval($start +
$GLOBALS['phpgw']->datetme->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i
+= 604800)
{
$cellcolor =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
***************
*** 2508,2512 ****
$p->set_block('week','event','event');
! $start = $this->datetime->get_weekday_start($year,
$month, $day);
$cellcolor = $this->theme['row_off'];
--- 2508,2512 ----
$p->set_block('week','event','event');
! $start =
$GLOBALS['phpgw']->datetime->get_weekday_start($year, $month, $day);
$cellcolor = $this->theme['row_off'];
***************
*** 2642,2651 ****
$var[] = Array(
'field' => lang('Start Date/Time'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['start']) -
$this->tz_offset)
);
$var[] = Array(
'field' => lang('End Date/Time'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['end']) -
$this->tz_offset)
);
--- 2642,2651 ----
$var[] = Array(
'field' => lang('Start Date/Time'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetme->tz_offset)
);
$var[] = Array(
'field' => lang('End Date/Time'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetme->tz_offset)
);
***************
*** 2662,2666 ****
$var[] = Array(
'field' => lang('Updated'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['modtime']) -
$this->tz_offset)
);
--- 2662,2666 ----
$var[] = Array(
'field' => lang('Updated'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['modtime']) -
$GLOBALS['phpgw']->datetme->tz_offset)
);
***************
*** 2719,2723 ****
if($recur_end != 0)
{
! $recur_end -= $this->tz_offset;
$str_extra .= lang('ends').':
'.lang($GLOBALS['phpgw']->common->show_date($recur_end,'l')).',
'.lang($GLOBALS['phpgw']->common->show_date($recur_end,'F')).'
'.$GLOBALS['phpgw']->common->show_date($recur_end,'d, Y').' ';
}
--- 2719,2723 ----
if($recur_end != 0)
{
! $recur_end -=
$GLOBALS['phpgw']->datetme->tz_offset;
$str_extra .= lang('ends').':
'.lang($GLOBALS['phpgw']->common->show_date($recur_end,'l')).',
'.lang($GLOBALS['phpgw']->common->show_date($recur_end,'F')).'
'.$GLOBALS['phpgw']->common->show_date($recur_end,'d, Y').' ';
}
***************
*** 2888,2892 ****
$time = Array();
! $daily =
$this->set_week_array($this->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
if($this->debug)
{
--- 2888,2892 ----
$time = Array();
! $daily =
$this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
if($this->debug)
{
***************
*** 3006,3010 ****
if($this->debug)
{
! echo '<!-- Time :
'.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['start'])
- $this->tz_offset).' -
'.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['end'])
- $this->tz_offset).' : Start : '.$ind.' : Interval # : '.$interval_start.'
-->'."\n";
}
}
--- 3006,3010 ----
if($this->debug)
{
! echo '<!-- Time :
'.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['start'])
- $GLOBALS['phpgw']->datetme->tz_offset).' -
'.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['end'])
- $GLOBALS['phpgw']->datetme->tz_offset).' : Start : '.$ind.' : Interval # :
'.$interval_start.' -->'."\n";
}
}
***************
*** 3219,3223 ****
$this->bo->cached_events = Array();
$this->bo->owner = $part;
! $this->so->owner = $part;
$this->bo->store_to_cache(
Array(
--- 3219,3224 ----
$this->bo->cached_events = Array();
$this->bo->owner = $part;
! $this->bo->so->owner = $part;
! $this->bo->so->open_box($part);
$this->bo->store_to_cache(
Array(
***************
*** 3267,3271 ****
}
$this->bo->owner = $owner;
! $this->so->owner = $owner;
return $str.'</table></center>'."\n";
}
--- 3268,3273 ----
}
$this->bo->owner = $owner;
! $this->bo->so->owner = $owner;
! $this->bo->so->open_box($owner);
return $str.'</table></center>'."\n";
}
***************
*** 3396,3400 ****
// Date
! $start = $this->bo->maketime($event['start']) -
$this->tz_offset;
$var[] = Array(
'field' => lang('Start Date'),
--- 3398,3402 ----
// Date
! $start = $this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$var[] = Array(
'field' => lang('Start Date'),
***************
*** 3418,3422 ****
// End Date
! $end = $this->bo->maketime($event['end']) -
$this->tz_offset;
$var[] = Array(
'field' => lang('End Date'),
--- 3420,3424 ----
// End Date
! $end = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$var[] = Array(
'field' => lang('End Date'),
***************
*** 3529,3538 ****
{
$checked = ' checked';
! $recur_end =
$this->bo->maketime($event['recur_enddate']) - $this->tz_offset;
}
else
{
$checked = '';
! $recur_end =
$this->bo->maketime($event['start']) + 86400 - $this->tz_offset;
}
--- 3531,3540 ----
{
$checked = ' checked';
! $recur_end =
$this->bo->maketime($event['recur_enddate']) -
$GLOBALS['phpgw']->datetme->tz_offset;
}
else
{
$checked = '';
! $recur_end =
$this->bo->maketime($event['start']) + 86400 -
$GLOBALS['phpgw']->datetme->tz_offset;
}
Index: class.uiicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uiicalendar.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uiicalendar.inc.php 6 Apr 2002 15:11:37 -0000 1.4
--- class.uiicalendar.inc.php 24 Jun 2002 23:24:24 -0000 1.5
***************
*** 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 ----
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.75,1.76 class.boicalendar.inc.php,1.18,1.19 class.socalendar.inc.php,1.23,1.24 class.socalendar__.inc.php,1.11,1.12 class.socalendar_sql.inc.php,1.28,1.29 class.uicalendar.inc.php,1.78,1.79 class.uiicalendar.inc.php,1.4,1.5,
Mark A Peters <address@hidden> <=