From b53e0f1c944de382806ff62404b507ced9b0eb7d Mon Sep 17 00:00:00 2001 From: skeeter Date: Sat, 31 Aug 2002 23:50:12 +0000 Subject: [PATCH] A couple of minor changes. Changed '->datetme->' to '->datetime->' and 1 item to '->datetime->users_localtime'. --- infolog/calendar/inc/class.uicalendar.inc.php | 65 ++++++++++--------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/infolog/calendar/inc/class.uicalendar.inc.php b/infolog/calendar/inc/class.uicalendar.inc.php index ad4bb2150b..e9829a9988 100755 --- a/infolog/calendar/inc/class.uicalendar.inc.php +++ b/infolog/calendar/inc/class.uicalendar.inc.php @@ -38,6 +38,7 @@ 'month' => True, 'get_month' => True, 'week' => True, + 'get_week' => True, 'year' => True, 'view' => True, 'edit' => True, @@ -221,12 +222,12 @@ ); $this->output_template_array($p,'daynames','mini_day',$var); } - $today = date('Ymd',$GLOBALS['phpgw']->datetime->gmtnow + $GLOBALS['phpgw']->datetme->tz_offset); + $today = date('Ymd',$GLOBALS['phpgw']->datetime->users_localtime); unset($date); - for($i=$weekstarttime + $GLOBALS['phpgw']->datetme->tz_offset;date('Ymd',$i)<=$monthend;$i += (24 * 3600 * 7)) + 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']->datetme->tz_offset,$cellcolor,$weekly); + $daily = $this->set_week_array($i - $GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly); @reset($daily); while(list($date,$day_params) = each($daily)) { @@ -514,7 +515,7 @@ } $now = $GLOBALS['phpgw']->datetime->makegmttime(0, 0, 0, $this->bo->month, $this->bo->day, $this->bo->year); - $now['raw'] += $GLOBALS['phpgw']->datetme->tz_offset; + $now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset; $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year); $p = CreateObject('phpgwapi.Template',$this->template_dir); @@ -620,7 +621,7 @@ unset($GLOBALS['phpgw_info']['flags']['noheader']); unset($GLOBALS['phpgw_info']['flags']['nonavbar']); $GLOBALS['phpgw']->common->phpgw_header(); - + echo '
'; $cal_id = ($vcal_id?$vcal_id:''); @@ -655,7 +656,7 @@ $this->bo->repeating_events = Array(); $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; + $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'); if(is_array($this->bo->cached_events[$check_date][0]) && @@ -1169,7 +1170,7 @@ } $now = $GLOBALS['phpgw']->datetime->makegmttime(0, 0, 0, $this->bo->month, $this->bo->day, $this->bo->year); - $now['raw'] += $GLOBALS['phpgw']->datetme->tz_offset; + $now['raw'] += $GLOBALS['phpgw']->datetime->tz_offset; $m = mktime(0,0,0,$this->bo->month,1,$this->bo->year); $p = CreateObject('phpgwapi.Template',$this->template_dir); @@ -1226,7 +1227,7 @@ return; } - $freetime = $GLOBALS['phpgw']->datetime->localdates(mktime(0,0,0,$event['start']['month'],$event['start']['mday'],$event['start']['year']) - $GLOBALS['phpgw']->datetme->tz_offset); + $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( 'date' => $freetime, @@ -1285,9 +1286,9 @@ 23 => 2 ); - $startdate = mktime(0,0,0,$this->bo->month,1,$this->bo->year) - $GLOBALS[\'phpgw\']->datetme->tz_offset; + $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\']->datetme->tz_offset; + $enddate = mktime(23,59,59,$this->bo->month,$this->bo->days,$this->bo->year) - $GLOBALS[\'phpgw\']->datetime->tz_offset; $header[] = lang(\'Category\'); for ($d = 1; $d <= $days; $d++) @@ -1465,7 +1466,7 @@ function matrixselect() { - $datetime = mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) - $GLOBALS['phpgw']->datetme->tz_offset; + $datetime = mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year) - $GLOBALS['phpgw']->datetime->tz_offset; $sb = CreateObject('phpgwapi.sbox'); @@ -1701,7 +1702,7 @@ { $event = $this->bo->read_entry($id); - $datetime = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetme->tz_offset; + $datetime = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset; $ids[strval($event['id'])]++; $info[strval($event['id'])] = $GLOBALS['phpgw']->common->show_date($datetime).$this->link_to_entry($event,$event['start']['month'],$event['start']['mday'],$event['start']['year']); @@ -1895,8 +1896,8 @@ $this->output_template_array($p,'table_row','footer_row',$var); 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; + $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 = ''; for ($i = -7; $i <= 7; $i++) @@ -2003,11 +2004,11 @@ $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; + $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']->datetme->tz_offset; - $nextday = mktime(0,0,0,$month,$day + 1,$year) - $GLOBALS['phpgw']->datetme->tz_offset; + $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) { $time = $GLOBALS['phpgw']->common->show_date($starttime,$this->bo->users_timeformat); @@ -2029,7 +2030,7 @@ 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); + $end_time = $GLOBALS['phpgw']->common->show_date(mktime(23,59,59,$month,$day,$year) - $GLOBALS['phpgw']->datetime->tz_offset,$this->bo->users_timeformat); } else { @@ -2157,8 +2158,8 @@ $mday = $event['start']['mday']; $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; + $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 = ''; for($i=0;$iset_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); + $daily = $this->set_week_array($startdate - $GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly); @reset($daily); while(list($date,$day_params) = each($daily)) { @@ -2494,7 +2495,7 @@ $cellcolor = $this->theme['row_on']; - for ($i=intval($start + $GLOBALS['phpgw']->datetme->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i += 604800) + for ($i=intval($start + $GLOBALS['phpgw']->datetime->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i += 604800) { $cellcolor = $GLOBALS['phpgw']->nextmatchs->alternate_row_color($cellcolor); $var = Array( @@ -2664,12 +2665,12 @@ } $var[] = Array( 'field' => lang('Start Date/Time'), - 'data' => $GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetme->tz_offset) + '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']->datetme->tz_offset) + 'data' => $GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset) ); $var[] = Array( @@ -2684,7 +2685,7 @@ $var[] = Array( 'field' => lang('Updated'), - 'data' => $GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['modtime']) - $GLOBALS['phpgw']->datetme->tz_offset) + 'data' => $GLOBALS['phpgw']->common->show_date($this->bo->maketime($event['modtime']) - $GLOBALS['phpgw']->datetime->tz_offset) ); $var[] = Array( @@ -2741,7 +2742,7 @@ $recur_end = $this->bo->maketime($event['recur_enddate']); if($recur_end != 0) { - $recur_end -= $GLOBALS['phpgw']->datetme->tz_offset; + $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').' '; } } @@ -3028,7 +3029,7 @@ $last_endtime = $endtime; if($this->debug) { - echo ''."\n"; + echo ''."\n"; } } } @@ -3420,7 +3421,7 @@ ); // Date - $start = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetme->tz_offset; + $start = $this->bo->maketime($event['start']) - $GLOBALS['phpgw']->datetime->tz_offset; $var[] = Array( 'field' => lang('Start Date'), 'data' => $GLOBALS['phpgw']->common->dateformatorder( @@ -3442,7 +3443,7 @@ ); // End Date - $end = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetme->tz_offset; + $end = $this->bo->maketime($event['end']) - $GLOBALS['phpgw']->datetime->tz_offset; $var[] = Array( 'field' => lang('End Date'), 'data' => $GLOBALS['phpgw']->common->dateformatorder( @@ -3554,12 +3555,12 @@ if($event['recur_enddate']['year'] != 0 && $event['recur_enddate']['month'] != 0 && $event['recur_enddate']['mday'] != 0) { $checked = ' checked'; - $recur_end = $this->bo->maketime($event['recur_enddate']) - $GLOBALS['phpgw']->datetme->tz_offset; + $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']->datetme->tz_offset; + $recur_end = $this->bo->maketime($event['start']) + 86400 - $GLOBALS['phpgw']->datetime->tz_offset; } $var[] = Array(