[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71.2.4,1.71.2.5 class.uicalendar.inc.php,1.66.2.10,1.66.2.11

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php class.uicalendar.inc.php 
Log Message:
This should solve the problem with the matrix view.  Also a little format 
fixing.

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71.2.4
retrieving revision 1.71.2.5
diff -C2 -r1.71.2.4 -r1.71.2.5
*** class.bocalendar.inc.php    1 May 2002 16:08:29 -0000       1.71.2.4
--- class.bocalendar.inc.php    5 May 2002 09:13:10 -0000       1.71.2.5
***************
*** 1891,1896 ****
                        {
                                $event = $this->cached_events[$fulldate][$k];
!                               $eventstart = 
$this->datetime->localdates($event->datetime);
!                               $eventend = 
$this->datetime->localdates($event->edatetime);
                                $start = ($eventstart['hour'] * 10000) + 
($eventstart['minute'] * 100);
                                $starttemp = $this->splittime("$start",False);
--- 1891,1896 ----
                        {
                                $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);

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.10
retrieving revision 1.66.2.11
diff -C2 -r1.66.2.10 -r1.66.2.11
*** class.uicalendar.inc.php    1 May 2002 13:00:36 -0000       1.66.2.10
--- class.uicalendar.inc.php    5 May 2002 09:13:10 -0000       1.66.2.11
***************
*** 441,461 ****
  
                        $var = Array(
!                               'printer_friendly'              =>      
$printer,
!                               'bg_text'                                       
=> $this->theme['bg_text'],
                                'small_calendar_prev'   =>      $minical_prev,
!                               'prev_week_link'                        =>      
$prev_week_link,
                                'small_calendar_this'   =>      $minical_this,
!                               'week_identifier'                       =>      
$this->bo->get_week_label(),
!                               'next_week_link'                        =>      
$next_week_link,
!                               'username'                                      
=>      $GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
                                'small_calendar_next'   =>      $minical_next,
!                               'week_display'                          =>      
$this->display_weekly(
                                        Array(
                                                'date'          => 
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),
                                                'showyear'      => true,
!                                               'owners'                => 
$this->bo->owner
                                        )
                                ),
!                               'print'                                         
=>      $print
                        );
  
--- 441,461 ----
  
                        $var = Array(
!                               'printer_friendly'      =>      $printer,
!                               'bg_text'               => 
$this->theme['bg_text'],
                                'small_calendar_prev'   =>      $minical_prev,
!                               'prev_week_link'        =>      $prev_week_link,
                                'small_calendar_this'   =>      $minical_this,
!                               'week_identifier'       =>      
$this->bo->get_week_label(),
!                               'next_week_link'        =>      $next_week_link,
!                               'username'              =>      
$GLOBALS['phpgw']->common->grab_owner_name($this->bo->owner),
                                'small_calendar_next'   =>      $minical_next,
!                               'week_display'          =>      
$this->display_weekly(
                                        Array(
                                                'date'          => 
sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day),
                                                'showyear'      => true,
!                                               'owners'        => 
$this->bo->owner
                                        )
                                ),
!                               'print'                 =>      $print
                        );
  
***************
*** 1604,1608 ****
                        {
                                case 'free/busy':
!                                       $freetime = 
$this->datetime->makegmttime(0,0,0,$this->bo->month,$this->bo->day,$this->bo->year);
                                        echo $this->timematrix(
                                                Array(
--- 1604,1608 ----
                        {
                                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(
***************
*** 2298,2306 ****
                
                        $p->set_file(
!                          Array (
!                               'month_header'  => 'month_header.tpl',
!                               'month_day'     => 'month_day.tpl'
!                       )
!               );
                        
$p->set_block('month_header','monthly_header','monthly_header');
                        
$p->set_block('month_header','month_column','month_column');
--- 2298,2306 ----
                
                        $p->set_file(
!                                  Array (
!                                       'month_header'  => 'month_header.tpl',
!                                       'month_day'     => 'month_day.tpl'
!                               )
!                       );
                        
$p->set_block('month_header','monthly_header','monthly_header');
                        
$p->set_block('month_header','month_column','month_column');
***************
*** 2407,2411 ****
                        if($this->debug)
                        {
!                               echo '<!-- datetime:gmtdate = 
'.$this->datetime->gmtdate.' -->'."\n";
                        }
  
--- 2407,2411 ----
                        if($this->debug)
                        {
!                               echo '<!-- datetime:gmtdate = 
'.$this->datetime->cv_gmtdate.' -->'."\n";
                        }
  
***************
*** 2816,2820 ****
                                'day_cal'       => 'day_cal.tpl'
                        );
!          $p->set_file($templates);
                        $p->set_block('day_cal','day','day');
                        $p->set_block('day_cal','day_row','day_row');
--- 2816,2820 ----
                                'day_cal'       => 'day_cal.tpl'
                        );
!                       $p->set_file($templates);
                        $p->set_block('day_cal','day','day');
                        $p->set_block('day_cal','day_row','day_row');
***************
*** 2852,2856 ****
                                {
                                        $rowspan_arr[$i][$j] = 0;
!                               $time[$ind][$j] = '';
                                }
                        }
--- 2852,2856 ----
                                {
                                        $rowspan_arr[$i][$j] = 0;
!                                       $time[$ind][$j] = '';
                                }
                        }
***************
*** 2866,2872 ****
                        }
                        if($daily[$date_to_eval]['appts'])
!               {
!                       $starttime = 0;
!                       $endtime = 0;
                                $events = 
$this->bo->cached_events[$date_to_eval];
                                $c_events = count($events);
--- 2866,2872 ----
                        }
                        if($daily[$date_to_eval]['appts'])
!                       {
!                               $starttime = 0;
!                               $endtime = 0;
                                $events = 
$this->bo->cached_events[$date_to_eval];
                                $c_events = count($events);
***************
*** 3130,3138 ****
                                
$GLOBALS['phpgw']->preferences->save_repository();
                        }
! //                    $increment = $this->bo->prefs['calendar']['interval'];
!                       $increment = 15;
                        $interval = (int)(60 / $increment);
  
!                       $pix = 
$GLOBALS['phpgw']->common->image('calendar','pix.gif');
  
                        $str = 
'<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))
--- 3130,3138 ----
                                
$GLOBALS['phpgw']->preferences->save_repository();
                        }
!                       $increment = $this->bo->prefs['calendar']['interval'];
! //                    $increment = 15;
                        $interval = (int)(60 / $increment);
  
!                       $pix = 
$GLOBALS['phpgw']->common->image('calendar','pix');
  
                        $str = 
'<center>'.lang($GLOBALS['phpgw']->common->show_date($date['raw'],'l'))