[Phpgroupware-cvs] calendar/inc class.bocalendar.inc.php class.soc...

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    calendar
Changes by:     Sigurd Nes <sigurdne>   06/12/06 19:10:45

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

Log message:
        notice

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.bocalendar.inc.php?cvsroot=phpgroupware&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.socalendar.inc.php?cvsroot=phpgroupware&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/calendar/inc/class.uicalendar.inc.php?cvsroot=phpgroupware&r1=1.130&r2=1.131

Patches:
Index: class.bocalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- class.bocalendar.inc.php    6 Dec 2006 15:12:46 -0000       1.110
+++ class.bocalendar.inc.php    6 Dec 2006 19:10:45 -0000       1.111
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.bocalendar.inc.php,v 1.110 2006/12/06 15:12:46 sigurdne 
Exp $ */
+       /* $Id: class.bocalendar.inc.php,v 1.111 2006/12/06 19:10:45 sigurdne 
Exp $ */
 
        class bocalendar
        {
@@ -134,6 +134,7 @@
                var $num_months;
 
                var $save_owner;
+               var $date;
 
                function bocalendar($session = 0)
                {
@@ -1553,6 +1554,7 @@
 
                function long_date($first,$last=0)
                {
+                       $range = '';
                        if (!is_array($first))
                        {
                                $first = $this->time2array($raw = $first);

Index: class.socalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.socalendar.inc.php,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- class.socalendar.inc.php    10 Nov 2006 13:34:30 -0000      1.33
+++ class.socalendar.inc.php    6 Dec 2006 19:10:45 -0000       1.34
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: class.socalendar.inc.php,v 1.33 2006/11/10 13:34:30 sigurdne Exp $ */
+  /* $Id: class.socalendar.inc.php,v 1.34 2006/12/06 19:10:45 sigurdne Exp $ */
 
        class socalendar
        {
@@ -84,7 +84,8 @@
 
                function 
list_repeated_events($syear,$smonth,$sday,$eyear,$emonth,$eday,$owner_id=0)
                {
-                       if($GLOBALS['phpgw_info']['server']['calendar_type'] != 
'sql')
+                       
if(!isset($GLOBALS['phpgw_info']['server']['calendar_type'])
+                               
||(isset($GLOBALS['phpgw_info']['server']['calendar_type']) && 
$GLOBALS['phpgw_info']['server']['calendar_type'] != 'sql'))
                        {
                                return Array();
                        }

Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- class.uicalendar.inc.php    6 Dec 2006 17:58:01 -0000       1.130
+++ class.uicalendar.inc.php    6 Dec 2006 19:10:45 -0000       1.131
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uicalendar.inc.php,v 1.130 2006/12/06 17:58:01 sigurdne 
Exp $ */
+       /* $Id: class.uicalendar.inc.php,v 1.131 2006/12/06 19:10:45 sigurdne 
Exp $ */
 
        class uicalendar
        {
@@ -57,6 +57,9 @@
                                                '3' => 
array(0,0,0,0,0,0,0,0,0,0,0,0,1,1,1,1,1,1,2,2,2,2,2,2), // 0=0-12h, 2=12-18h, 
3=18-23h
                                                '4' => 
array(0,0,0,0,0,0,0,1,1,1,1,1,2,2,2,2,2,2,3,3,3,3,3,3)  // 0=0-7, 7-12h, 
3=12-18h, 4=18-23h
                                        );
+               var $theme;
+               var $header_included;
+               var $week_type;
 
                var $public_functions = array
                        (
@@ -266,7 +269,8 @@
                        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']->datetime->tz_offset,$cellcolor,$weekly);
+//                             $daily = $this->set_week_array($i - 
$GLOBALS['phpgw']->datetime->tz_offset,$cellcolor,$weekly); // $cellcolor and 
$weekly not set
+                               $daily = $this->set_week_array($i - 
$GLOBALS['phpgw']->datetime->tz_offset,false,false);
                                foreach($daily as $date => $day_params)
                                {
                                        print_debug('Mini-Cal Date',$date);
@@ -624,7 +628,7 @@
                                }
 
                                $var = array(
-                                       'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uialarm.manager'),
+                                       'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uialarm.manager')),
                                        'action_text_button'    => lang('Alarm 
Management'),
                                        'action_confirm_button' => '',
                                        'action_extra_field'    => '<input 
type="hidden" name="cal_id" value="'.$cal_id.'">'
@@ -690,7 +694,7 @@
                                        if 
($GLOBALS['phpgw_info']['user']['account_id'] == $user)
                                        {
                                                $var = array(
-                                                       'action_url_button'     
=> $GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uialarm.manager'),
+                                                       'action_url_button'     
=> 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uialarm.manager')),
                                                        'action_text_button'    
=> lang('Alarm Management'),
                                                        'action_confirm_button' 
=> '',
                                                        'action_extra_field'    
=> '<input type="hidden" name="cal_id" value="'.$cal_id.'">'
@@ -2382,7 +2386,7 @@
 
                        $var = array(
                                'submit_button'         => lang('Submit'),
-                               'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php','menuaction=calendar.uiicalendar.import'),
+                               'action_url_button'     => 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uiicalendar.import')),
                                'action_text_button'    => lang('Import'),
                                'action_confirm_button' => '',
                                'action_extra_field'    => ''
@@ -2826,7 +2830,7 @@
                        
$p->set_block('month_header','monthly_header','monthly_header');
                        
$p->set_block('month_header','column_title','column_title');
 
-                       $p->set_var($var);
+       //              $p->set_var($var);  // no $var is set
 
                        if($display_name == True)
                        {
@@ -4274,10 +4278,12 @@
                {
                        for ($j=0,$datetime=$startdate;$j<7;$j++,$datetime += 
86400)
                        {
+                               $cellclass = $j % 2 ? 'row_on' : 'row_off';
+                               
                                $date = date('Ymd',$datetime + (60 * 60 * 2)); 
// +2h to be save when switching to and from dst, $datetime is alreay + 
TZ-Offset
                                print_debug('set_week_array : Date ',$date);
 
-                               if($events = $this->bo->cached_events[$date])
+                               if(isset($this->bo->cached_events[$date]) && 
$events = $this->bo->cached_events[$date])
                                {
                                        print_debug('Date',$date);
                                        print_debug('Appointments 
Found',count($events));
@@ -4304,7 +4310,7 @@
                                        $appts = False;
                                }
 
-                               $holidays = $this->bo->cached_holidays[$date];
+                               $holidays = 
(isset($this->bo->cached_holidays[$date]) && $this->bo->cached_holidays[$date] 
? $this->bo->cached_holidays[$date]:'');
                                if($weekly)
                                {
                                        $cellcolor = 
$GLOBALS['phpgw']->nextmatchs->alternate_row_class($cellcolor);