[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/calendar/inc class.bocalendar.inc.php,1.
|
From: |
Ralf Becker <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: infolog/calendar/inc class.bocalendar.inc.php,1.2,1.3 class.socalendar_sql.inc.php,1.2,1.3 class.uicalendar.inc.php,1.4,1.5 |
|
Date: |
Tue, 06 Aug 2002 03:56:35 -0400 |
Update of /cvsroot/phpgroupware/infolog/calendar/inc
In directory subversions:/tmp/cvs-serv18133
Modified Files:
class.bocalendar.inc.php class.socalendar_sql.inc.php
class.uicalendar.inc.php
Log Message:
merged skeeter's last changes
Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.bocalendar.inc.php 12 May 2002 21:11:34 -0000 1.2
--- class.bocalendar.inc.php 6 Aug 2002 07:56:32 -0000 1.3
***************
*** 98,102 ****
var $cached_events;
var $repeating_events;
- var $datetime;
var $day;
var $month;
--- 98,101 ----
***************
*** 182,186 ****
if ($this->prefs['common']['timeformat'] == '12')
{
! $this->users_timeformat = 'h:i a';
}
else
--- 181,185 ----
if ($this->prefs['common']['timeformat'] == '12')
{
! $this->users_timeformat = 'h:ia';
}
else
***************
*** 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)
***************
*** 407,411 ****
//RB if($this->owner == $event['owner'])
//RB {
! $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;
--- 405,409 ----
//RB if($this->owner == $event['owner'])
//RB {
! $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;
***************
*** 947,961 ****
$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;
--- 945,959 ----
$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;
***************
*** 1062,1066 ****
$temp_event_start =
sprintf("%d%02d",$event['start']['hour'],$event['start']['min']);
$temp_event_end =
sprintf("%d%02d",$event['end']['hour'],$event['end']['min']);
! if((($temp_start_time
<= $temp_event_start) && ($temp_end_time >= $temp_event_start) &&
($temp_end_time <= $temp_event_end)) ||
(($temp_start_time >= $temp_event_start) && ($temp_start_time <
$temp_event_end) && ($temp_end_time >= $temp_event_end)) ||
(($temp_start_time <= $temp_event_start) && ($temp_end_time >=
$temp_event_end)) ||
--- 1060,1065 ----
$temp_event_start =
sprintf("%d%02d",$event['start']['hour'],$event['start']['min']);
$temp_event_end =
sprintf("%d%02d",$event['end']['hour'],$event['end']['min']);
! // if((($temp_start_time
<= $temp_event_start) && ($temp_end_time >= $temp_event_start) &&
($temp_end_time <= $temp_event_end)) ||
! if((($temp_start_time
<= $temp_event_start) && ($temp_end_time > $temp_event_start) &&
($temp_end_time <= $temp_event_end)) ||
(($temp_start_time >= $temp_event_start) && ($temp_start_time <
$temp_event_end) && ($temp_end_time >= $temp_event_end)) ||
(($temp_start_time <= $temp_event_start) && ($temp_end_time >=
$temp_event_end)) ||
***************
*** 1095,1099 ****
// 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;
// }
//
--- 1094,1098 ----
// 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;
// }
//
***************
*** 1286,1291 ****
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
--- 1285,1290 ----
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
***************
*** 1389,1393 ****
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']))
{
--- 1388,1392 ----
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']))
{
***************
*** 1577,1581 ****
}
! 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)))
{
--- 1576,1580 ----
}
! 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)))
{
***************
*** 1742,1747 ****
}
}
! // $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)
{
--- 1741,1746 ----
}
}
! // $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)
{
***************
*** 1886,1891 ****
{
$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);
--- 1885,1890 ----
{
$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);
***************
*** 2050,2059 ****
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;
}
--- 2049,2058 ----
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;
}
***************
*** 2164,2168 ****
$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;
--- 2163,2167 ----
$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.socalendar_sql.inc.php
===================================================================
RCS file:
/cvsroot/phpgroupware/infolog/calendar/inc/class.socalendar_sql.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** class.socalendar_sql.inc.php 12 May 2002 21:11:34 -0000 1.2
--- class.socalendar_sql.inc.php 6 Aug 2002 07:56:32 -0000 1.3
***************
*** 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/infolog/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** class.uicalendar.inc.php 12 May 2002 21:11:34 -0000 1.4
--- class.uicalendar.inc.php 6 Aug 2002 07:56:32 -0000 1.5
***************
*** 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);
***************
*** 646,650 ****
$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');
--- 656,660 ----
$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');
***************
*** 1159,1164 ****
}
! $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);
--- 1169,1174 ----
}
! $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);
***************
*** 1217,1221 ****
}
! $freetime =
$this->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
- $this->tz_offset);
echo $this->timematrix(
Array(
--- 1227,1231 ----
}
! $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(
***************
*** 1276,1282 ****
);
! $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\');
--- 1286,1292 ----
);
! $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\');
***************
*** 1456,1460 ****
function matrixselect()
{
! $datetime =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$this->tz_offset;
$sb = CreateObject('phpgwapi.sbox');
--- 1466,1470 ----
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');
***************
*** 1619,1623 ****
{
case 'free/busy':
! $freetime =
$this->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year));
echo $this->timematrix(
Array(
--- 1629,1633 ----
{
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(
***************
*** 1692,1696 ****
$event = $this->bo->read_entry($id);
! $datetime =
$this->bo->maketime($event['start']) - $this->tz_offset;
$ids[strval($event['id'])]++;
--- 1702,1706 ----
$event = $this->bo->read_entry($id);
! $datetime =
$this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetme->tz_offset;
$ids[strval($event['id'])]++;
***************
*** 1886,1891 ****
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 = '';
--- 1896,1901 ----
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 = '';
***************
*** 1991,2014 ****
//RB $editable = ((!$this->bo->printer_friendly) &&
(($is_private && $this->bo->check_perms(PHPGW_ACL_PRIVATE)) || !$is_private));
//RB editable means here, ok to set a link to view
- $editable = !$this->bo->printer_friendly &&
$this->bo->rb_check_perms(PHPGW_ACL_READ,$event);
$is_private = !$event['public'] &&
!$this->bo->rb_check_perms(PHPGW_ACL_READ,$event);
! $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)
{
--- 2001,2012 ----
//RB $editable = ((!$this->bo->printer_friendly) &&
(($is_private && $this->bo->check_perms(PHPGW_ACL_PRIVATE)) || !$is_private));
//RB editable means here, ok to set a link to view
$is_private = !$event['public'] &&
!$this->bo->rb_check_perms(PHPGW_ACL_READ,$event);
! $editable = !$this->bo->printer_friendly &&
$this->bo->rb_check_perms(PHPGW_ACL_READ,$event);
! $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)
{
***************
*** 2032,2036 ****
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
--- 2030,2034 ----
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
***************
*** 2049,2060 ****
$text .=
$this->bo->display_status($event['users_status']);
}
! $text = '<font size="-2"
face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr> '.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br;
if ($editable)
{
$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)
--- 2047,2058 ----
$text .=
$this->bo->display_status($event['users_status']);
}
! $text = '<font size="-2"
face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr>
'.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br;
if ($editable)
{
$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)
***************
*** 2119,2123 ****
'description' => $description
);
!
$this->output_template_array($p,'picture','pict',$var);
}
}
--- 2117,2121 ----
'description' => $description
);
!
$this->output_template_array($this->link_tpl,'picture','pict',$var);
}
}
***************
*** 2131,2143 ****
'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;
}
--- 2129,2143 ----
'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;
}
***************
*** 2158,2163 ****
$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 = '';
--- 2158,2163 ----
$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 = '';
***************
*** 2264,2268 ****
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);
--- 2264,2268 ----
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);
***************
*** 2298,2302 ****
}
! if($this->datetime->days[$i]['weekday'])
{
switch($col_width)
--- 2298,2302 ----
}
! if($GLOBALS['phpgw']->datetime->days[$i]['weekday'])
{
switch($col_width)
***************
*** 2315,2321 ****
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);
}
--- 2315,2321 ----
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);
}
***************
*** 2332,2336 ****
$temp_owner = $this->bo->owner;
! $this->bo->owner = $owner;
$str = '';
--- 2332,2336 ----
$temp_owner = $this->bo->owner;
! // $this->bo->owner = $owner;
$str = '';
***************
*** 2358,2363 ****
$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))
--- 2358,2363 ----
$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))
***************
*** 2366,2370 ****
$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))
{
--- 2366,2370 ----
$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))
{
***************
*** 2453,2457 ****
if($this->debug)
{
! echo '<!-- datetime:gmtdate =
'.$this->datetime->cv_gmtdate.' -->'."\n";
}
--- 2453,2457 ----
if($this->debug)
{
! echo '<!-- datetime:gmtdate =
'.$GLOBALS['phpgw']->datetime->cv_gmtdate.' -->'."\n";
}
***************
*** 2467,2471 ****
$monthend = intval(date('Ymd',mktime(0,0,0,$month +
1,0,$year)));
! $start = $this->datetime->get_weekday_start($year,
$month, 1);
if($this->debug)
--- 2467,2471 ----
$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)
***************
*** 2495,2499 ****
$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);
--- 2495,2499 ----
$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);
***************
*** 2530,2534 ****
$p->set_block('week','event','event');
! $start = $this->datetime->get_weekday_start($year,
$month, $day);
$cellcolor = $this->theme['row_off'];
--- 2530,2534 ----
$p->set_block('week','event','event');
! $start =
$GLOBALS['phpgw']->datetime->get_weekday_start($year, $month, $day);
$cellcolor = $this->theme['row_off'];
***************
*** 2665,2674 ****
$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)
);
--- 2665,2674 ----
$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)
);
***************
*** 2685,2689 ****
$var[] = Array(
'field' => lang('Updated'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['modtime']) -
$this->tz_offset)
);
--- 2685,2689 ----
$var[] = Array(
'field' => lang('Updated'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['modtime']) -
$GLOBALS['phpgw']->datetme->tz_offset)
);
***************
*** 2742,2746 ****
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').' ';
}
--- 2742,2746 ----
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').' ';
}
***************
*** 2911,2915 ****
$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)
{
--- 2911,2915 ----
$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)
{
***************
*** 3029,3033 ****
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";
}
}
--- 3029,3033 ----
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";
}
}
***************
*** 3242,3246 ****
$this->bo->cached_events = Array();
$this->bo->owner = $part;
! $this->so->owner = $part;
$this->bo->store_to_cache(
Array(
--- 3242,3247 ----
$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(
***************
*** 3290,3294 ****
}
$this->bo->owner = $owner;
! $this->so->owner = $owner;
return $str.'</table></center>'."\n";
}
--- 3291,3296 ----
}
$this->bo->owner = $owner;
! $this->bo->so->owner = $owner;
! $this->bo->so->open_box($owner);
return $str.'</table></center>'."\n";
}
***************
*** 3419,3423 ****
// Date
! $start = $this->bo->maketime($event['start']) -
$this->tz_offset;
$var[] = Array(
'field' => lang('Start Date'),
--- 3421,3425 ----
// Date
! $start = $this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$var[] = Array(
'field' => lang('Start Date'),
***************
*** 3441,3445 ****
// End Date
! $end = $this->bo->maketime($event['end']) -
$this->tz_offset;
$var[] = Array(
'field' => lang('End Date'),
--- 3443,3447 ----
// End Date
! $end = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$var[] = Array(
'field' => lang('End Date'),
***************
*** 3553,3562 ****
{
$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;
}
--- 3555,3564 ----
{
$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;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/calendar/inc class.bocalendar.inc.php,1.2,1.3 class.socalendar_sql.inc.php,1.2,1.3 class.uicalendar.inc.php,1.4,1.5,
Ralf Becker <address@hidden> <=