[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: infolog/calendar/inc class.uicalendar.inc.php,1.
|
From: |
Mark A Peters <address@hidden> |
|
Subject: |
[Phpgroupware-cvs] CVS: infolog/calendar/inc class.uicalendar.inc.php,1.5,1.6 |
|
Date: |
Sat, 31 Aug 2002 19:50:14 -0400 |
Update of /cvsroot/phpgroupware/infolog/calendar/inc
In directory subversions:/tmp/cvs-serv1694
Modified Files:
class.uicalendar.inc.php
Log Message:
A couple of minor changes. Changed '->datetme->' to '->datetime->' and 1 item
to '->datetime->users_localtime'.
Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/infolog/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** class.uicalendar.inc.php 6 Aug 2002 07:56:32 -0000 1.5
--- class.uicalendar.inc.php 31 Aug 2002 23:50:12 -0000 1.6
***************
*** 39,42 ****
--- 39,43 ----
'get_month' => True,
'week' => True,
+ 'get_week' => True,
'year' => True,
'view' => True,
***************
*** 222,231 ****
$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))
--- 223,232 ----
$this->output_template_array($p,'daynames','mini_day',$var);
}
! $today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
unset($date);
! for($i=$weekstarttime +
$GLOBALS['phpgw']->datetime->tz_offset;date('Ymd',$i)<=$monthend;$i += (24 *
3600 * 7))
{
unset($var);
! $daily = $this->set_week_array($i -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
@reset($daily);
while(list($date,$day_params) = each($daily))
***************
*** 515,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);
--- 516,520 ----
$now = $GLOBALS['phpgw']->datetime->makegmttime(0,
0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
! $now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset;
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
***************
*** 621,625 ****
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw']->common->phpgw_header();
!
echo '<center>';
--- 622,626 ----
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
$GLOBALS['phpgw']->common->phpgw_header();
!
echo '<center>';
***************
*** 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');
--- 657,661 ----
$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']->datetime->tz_offset;
$this->bo->check_repeating_events($datetime);
$check_date =
$GLOBALS['phpgw']->common->show_date($datetime,'Ymd');
***************
*** 1170,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);
--- 1171,1175 ----
$now = $GLOBALS['phpgw']->datetime->makegmttime(0,
0, 0, $this->bo->month, $this->bo->day, $this->bo->year);
! $now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset;
$m = mktime(0,0,0,$this->bo->month,1,$this->bo->year);
***************
*** 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(
--- 1228,1232 ----
}
! $freetime =
$GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year'])
- $GLOBALS['phpgw']->datetime->tz_offset);
echo $this->timematrix(
Array(
***************
*** 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\');
--- 1287,1293 ----
);
! $startdate =
mktime(0,0,0,$this->bo->month,1,$this->bo->year) -
$GLOBALS[\'phpgw\']->datetime->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\']->datetime->tz_offset;
$header[] = lang(\'Category\');
***************
*** 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');
--- 1467,1471 ----
function matrixselect()
{
! $datetime =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$GLOBALS['phpgw']->datetime->tz_offset;
$sb = CreateObject('phpgwapi.sbox');
***************
*** 1702,1706 ****
$event = $this->bo->read_entry($id);
! $datetime =
$this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetme->tz_offset;
$ids[strval($event['id'])]++;
--- 1703,1707 ----
$event = $this->bo->read_entry($id);
! $datetime =
$this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset;
$ids[strval($event['id'])]++;
***************
*** 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 = '';
--- 1897,1902 ----
unset($thisdate);
! $thisdate =
mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) -
$GLOBALS['phpgw']->datetime->tz_offset;
! $sun =
$GLOBALS['phpgw']->datetime->get_weekday_start($this->bo->year,$this->bo->month,$this->bo->day)
- $GLOBALS['phpgw']->datetime->tz_offset;
$str = '';
***************
*** 2004,2012 ****
$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)
{
--- 2005,2013 ----
$editable = !$this->bo->printer_friendly &&
$this->bo->rb_check_perms(PHPGW_ACL_READ,$event);
! $starttime = $this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetime->tz_offset;
! $endtime = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetime->tz_offset;
$rawdate = mktime(0,0,0,$month,$day,$year);
! $rawdate_offset = $rawdate -
$GLOBALS['phpgw']->datetime->tz_offset;
! $nextday = mktime(0,0,0,$month,$day + 1,$year) -
$GLOBALS['phpgw']->datetime->tz_offset;
if
(intval($GLOBALS['phpgw']->common->show_date($starttime,'Hi')) && $starttime ==
$endtime)
{
***************
*** 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
--- 2031,2035 ----
if($endtime >= ($rawdate_offset + 86400))
{
! $end_time =
$GLOBALS['phpgw']->common->show_date(mktime(23,59,59,$month,$day,$year) -
$GLOBALS['phpgw']->datetime->tz_offset,$this->bo->users_timeformat);
}
else
***************
*** 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 = '';
--- 2159,2164 ----
$year = $event['start']['year'];
! $start =
mktime($event['start']['hour'],$event['start']['min'],$event['start']['sec'],$month,$mday,$year)
- $GLOBALS['phpgw']->datetime->tz_offset;
! $end = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetime->tz_offset;
$overlap = '';
***************
*** 2359,2363 ****
}
$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))
--- 2360,2364 ----
}
$today =
date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime);
! $daily = $this->set_week_array($startdate -
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly);
@reset($daily);
while(list($date,$day_params) = each($daily))
***************
*** 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);
--- 2496,2500 ----
$cellcolor = $this->theme['row_on'];
! for ($i=intval($start +
$GLOBALS['phpgw']->datetime->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i
+= 604800)
{
$cellcolor =
$GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor);
***************
*** 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)
);
--- 2666,2675 ----
$var[] = Array(
'field' => lang('Start Date/Time'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetime->tz_offset)
);
$var[] = Array(
'field' => lang('End Date/Time'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetime->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)
);
--- 2686,2690 ----
$var[] = Array(
'field' => lang('Updated'),
! 'data' =>
$GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['modtime']) -
$GLOBALS['phpgw']->datetime->tz_offset)
);
***************
*** 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').' ';
}
--- 2743,2747 ----
if($recur_end != 0)
{
! $recur_end -=
$GLOBALS['phpgw']->datetime->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').' ';
}
***************
*** 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";
}
}
--- 3030,3034 ----
if($this->debug)
{
! echo '<!-- Time :
'.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['start'])
- $GLOBALS['phpgw']->datetime->tz_offset).' -
'.$GLOBALS['phpgw']->common->show_date($this->bo->maketime($events[$i]['end'])
- $GLOBALS['phpgw']->datetime->tz_offset).' : Start : '.$ind.' : Interval # :
'.$interval_start.' -->'."\n";
}
}
***************
*** 3421,3425 ****
// Date
! $start = $this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$var[] = Array(
'field' => lang('Start Date'),
--- 3422,3426 ----
// Date
! $start = $this->bo->maketime($event['start']) -
$GLOBALS['phpgw']->datetime->tz_offset;
$var[] = Array(
'field' => lang('Start Date'),
***************
*** 3443,3447 ****
// End Date
! $end = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetme->tz_offset;
$var[] = Array(
'field' => lang('End Date'),
--- 3444,3448 ----
// End Date
! $end = $this->bo->maketime($event['end']) -
$GLOBALS['phpgw']->datetime->tz_offset;
$var[] = Array(
'field' => lang('End Date'),
***************
*** 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;
}
--- 3556,3565 ----
{
$checked = ' checked';
! $recur_end =
$this->bo->maketime($event['recur_enddate']) -
$GLOBALS['phpgw']->datetime->tz_offset;
}
else
{
$checked = '';
! $recur_end =
$this->bo->maketime($event['start']) + 86400 -
$GLOBALS['phpgw']->datetime->tz_offset;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: infolog/calendar/inc class.uicalendar.inc.php,1.5,1.6,
Mark A Peters <address@hidden> <=