[Phpgroupware-cvs] calendar/inc class.uicalendar.inc.php

[Dave Hall]

CVSROOT:        /sources/phpgroupware
Module name:    calendar
Changes by:     Dave Hall <skwashd>     06/12/05 08:59:41

Modified files:
        inc            : class.uicalendar.inc.php 

Log message:
        get the basics kinda working again - this is still broken, but the 
fatal tpl error is gone :)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.127&r2=1.128

Patches:
Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -b -r1.127 -r1.128
--- class.uicalendar.inc.php    20 Nov 2006 09:55:48 -0000      1.127
+++ class.uicalendar.inc.php    5 Dec 2006 08:59:41 -0000       1.128
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uicalendar.inc.php,v 1.127 2006/11/20 09:55:48 sigurdne 
Exp $ */
+       /* $Id: class.uicalendar.inc.php,v 1.128 2006/12/05 08:59:41 skwashd 
Exp $ */
 
        class uicalendar
        {
@@ -121,7 +121,8 @@
                        if($this->bo->use_session)
                        {
                                // save return-fkt for add, view, ...
-                               if(isset($GLOBALS['phpgw_info']['menuaction']) 
&& $GLOBALS['phpgw_info']['menuaction'])
+                               if ( 
isset($GLOBALS['phpgw_info']['menuaction']) 
+                                       && $GLOBALS['phpgw_info']['menuaction'] 
)
                                {
                                        list(,,$fkt) = 
explode('.',$GLOBALS['phpgw_info']['menuaction']);
                                        if ($fkt == 'day' || $fkt == 'week' || 
$fkt == 'week_new' || $fkt == 'month' || $fkt == 'year' || $fkt == 'planner')
@@ -475,7 +476,8 @@
                        $right_link = '<a 
href="'.$this->page('year','&year='.($this->bo->year + 1)).'">&gt;&gt;</a>';
                        $link = 'day';
 
-                       $var = array(
+                       $var = array
+                       (
                                'left_link' => $left_link,
                                'year_text' => $this->bo->year,
                                'right_link'=> $right_link,
@@ -2855,8 +2857,8 @@
                
                        $p->set_file('month_day', 'month_day.tpl');
 
-                       
$p->set_block('month_day','monthly_header','monthly_header');
-                       
$p->set_block('month_day','month_column','month_column');
+                       
//$p->set_block('month_day','monthly_header','monthly_header');
+                       
//$p->set_block('month_day','month_column','month_column');
                        $p->set_block('month_day','month_daily','month_daily');
                        $p->set_block('month_day','day_event','day_event');
                        $p->set_block('month_day','event','event');
@@ -3016,7 +3018,8 @@
                        for ($i=intval($start + 
$GLOBALS['phpgw']->datetime->tz_offset);intval(date('Ymd',$i)) <= $monthend;$i 
+= 604800)
                        {
                                $cellclass = $cnt % 2 ? 'row_on' : 'row_off';
-                               $var = array(
+                               $var = array
+                               (
                                        'day_events' => 
$this->display_week($i,False,$cellclass,False,$owner,$monthstart,$monthend)
                                );
                                
$this->output_template_array($p,'row','event',$var);
@@ -3042,7 +3045,8 @@
                        $p->set_unknowns('keep');
 
                        $p->set_file(
-                               array(
+                               array
+                               (
                                        'week'  => 'month_day.tpl'
                                )
                        );