[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.55.2.13,1.66.2.55.2.14

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/calendar/inc
In directory subversions:/tmp/cvs-serv1784

Modified Files:
      Tag: Version-0_9_16-branch
        class.uicalendar.inc.php 
Log Message:
fix for day-view on days without any event


Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.55.2.13
retrieving revision 1.66.2.55.2.14
diff -C2 -r1.66.2.55.2.13 -r1.66.2.55.2.14
*** class.uicalendar.inc.php    30 May 2003 12:55:08 -0000      1.66.2.55.2.13
--- class.uicalendar.inc.php    1 Jun 2003 09:57:10 -0000       1.66.2.55.2.14
***************
*** 3216,3225 ****
                        $date_to_eval = 
sprintf("%04d%02d%02d",$params['year'],$params['month'],$params['day']);
  
                        $daily = 
$this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
                        print_debug('Date to Eval',$date_to_eval);
                        if($daily[$date_to_eval]['appts'])
                        {
-                               $day_start = 
mktime(intval($this->bo->prefs['calendar']['workdaystarts']),-intval($this->bo->prefs['calendar']['interval']),0,$params['month'],$params['day'],$params['year']);
-                               $day_end = 
mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']);
                                $events = 
$this->bo->cached_events[$date_to_eval];
                                print_debug('Date',$date_to_eval);
--- 3216,3225 ----
                        $date_to_eval = 
sprintf("%04d%02d%02d",$params['year'],$params['month'],$params['day']);
  
+                       $day_start = 
mktime(intval($this->bo->prefs['calendar']['workdaystarts']),0,0,$params['month'],$params['day'],$params['year']);
+                       $day_end = 
mktime(intval($this->bo->prefs['calendar']['workdayends']),0,1,$params['month'],$params['day'],$params['year']);
                        $daily = 
$this->set_week_array($GLOBALS['phpgw']->datetime->get_weekday_start($params['year'],$params['month'],$params['day']),$this->theme['row_on'],True);
                        print_debug('Date to Eval',$date_to_eval);
                        if($daily[$date_to_eval]['appts'])
                        {
                                $events = 
$this->bo->cached_events[$date_to_eval];
                                print_debug('Date',$date_to_eval);
***************
*** 3273,3277 ****
                                }
                        }
!                       $last_slot = $this->slot_num($day_end);
                        $rowspan = 0;
                        for ($slot = 0; $slot <= $last_slot; ++$slot)
--- 3273,3277 ----
                                }
                        }
!                       $last_slot = 
$this->slot_num($day_end,$day_start,$day_end);
                        $rowspan = 0;
                        for ($slot = 0; $slot <= $last_slot; ++$slot)