holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

This should solve the problem with the matrix view. Also a little format fixing.

Browse Source
This commit is contained in:
skeeter 2002-05-05 17:47:15 +00:00
parent 7bb5e67739
commit 0ce7166f26
2 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.bocalendar.inc.php
View File

@ -1849,8 +1849,8 @@
for($k=0;$k<count($this->cached_events[$fulldate]);$k++) for($k=0;$k<count($this->cached_events[$fulldate]);$k++)
{ {
$event = $this->cached_events[$fulldate][$k]; $event = $this->cached_events[$fulldate][$k];
$eventstart = $this->datetime->localdates($event->datetime); $eventstart = $this->datetime->localdates($this->maketime($event['start']) - $this->datetime->tz_offset);
$eventend = $this->datetime->localdates($event->edatetime); $eventend = $this->datetime->localdates($this->maketime($event['end']) - $this->datetime->tz_offset);
$start = ($eventstart['hour'] * 10000) + ($eventstart['minute'] * 100); $start = ($eventstart['hour'] * 10000) + ($eventstart['minute'] * 100);
$starttemp = $this->splittime("$start",False); $starttemp = $this->splittime("$start",False);
$subminute = 0; $subminute = 0;

10
calendar/inc/class.uicalendar.inc.php
View File

@ -1599,7 +1599,7 @@
switch($GLOBALS['HTTP_POST_VARS']['matrixtype']) switch($GLOBALS['HTTP_POST_VARS']['matrixtype'])
{ {
case 'free/busy': case 'free/busy':
$freetime = $this->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year); $freetime = $this->datetime->gmtdate(mktime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year));
echo $this->timematrix( echo $this->timematrix(
Array( Array(
'date' => $freetime, 'date' => $freetime,
@ -2430,7 +2430,7 @@
{ {
if($this->debug) if($this->debug)
{ {
echo '<!-- datetime:gmtdate = '.$this->datetime->gmtdate.' -->'."\n"; echo '<!-- datetime:gmtdate = '.$this->datetime->cv_gmtdate.' -->'."\n";
} }
$this->bo->store_to_cache( $this->bo->store_to_cache(
@ -3157,11 +3157,11 @@
$GLOBALS['phpgw']->preferences->add('calendar','interval',15); $GLOBALS['phpgw']->preferences->add('calendar','interval',15);
$GLOBALS['phpgw']->preferences->save_repository(); $GLOBALS['phpgw']->preferences->save_repository();
} }
// $increment = $this->bo->prefs['calendar']['interval']; $increment = $this->bo->prefs['calendar']['interval'];
$increment = 15; // $increment = 15;
$interval = (int)(60 / $increment); $interval = (int)(60 / $increment);
$pix = $GLOBALS['phpgw']->common->image('calendar','pix.gif'); $pix = $GLOBALS['phpgw']->common->image('calendar','pix');
$str = '<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l')) $str = '<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
. ', '.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')) . ', '.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F'))