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

[Sigurd Nes]

CVSROOT:        /sources/phpgroupware
Module name:    calendar
Changes by:     Sigurd Nes <sigurdne>   06/12/11 20:47:58

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

Log message:
        some work on "planner"

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

Patches:
Index: class.uicalendar.inc.php
===================================================================
RCS file: /sources/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -b -r1.143 -r1.144
--- class.uicalendar.inc.php    11 Dec 2006 19:36:42 -0000      1.143
+++ class.uicalendar.inc.php    11 Dec 2006 20:47:58 -0000      1.144
@@ -12,7 +12,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-       /* $Id: class.uicalendar.inc.php,v 1.143 2006/12/11 19:36:42 sigurdne 
Exp $ */
+       /* $Id: class.uicalendar.inc.php,v 1.144 2006/12/11 20:47:58 sigurdne 
Exp $ */
 
        class uicalendar
        {
@@ -1359,7 +1359,7 @@
                                $cssclass = $m % 2 ? 'row_on' : 'row_off';
                                $cols  = $days * $intervals_per_day;
 
-                               $hdr[0]['.'.$i] = 'classr="'.$cssclass.'" 
colspan="'.$cols.'"';
+                               $hdr[0]['.'.$i] = 'classr="'.$cssclass.'" 
colspan="'.$cols.'" align ="center"';
                                $prev_month = 
sprintf('%04d%02d01',$y-($m==1),$m > 1?$m-1:12);
                                $next_month = 
sprintf('%04d%02d01',$y+($m==12),$m < 12?$m+1:1);
                                $prev_link = 
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>'calendar.uicalendar.planner','date'=>$prev_month));
@@ -1367,15 +1367,16 @@
                                $hdr[0][$i] = "<b><a 
href=\"$prev_link\">&lt;&lt;</a> &nbsp $month &nbsp <a 
href=\"$next_link\">&gt;&gt;</a></b>";
 
                                $add_owner = array();   // if no add-rights on 
the showed cal use own cal
-                               if ( !$this->bo->save_owner 
+                               if ( (!isset($this->bo->save_owner) || 
!$this->bo->save_owner)
                                        && 
!$this->bo->check_perms(PHPGW_ACL_ADD) 
-                                       || 
!$this->bo->check_perms(PHPGW_ACL_ADD,0,$this->bo->save_owner))
+                                       || 
!$this->bo->check_perms(PHPGW_ACL_ADD,0,(isset($this->bo->save_owner)?$this->bo->save_owner:'')))
                                {
                                        $add_owner = array('owner' => 
$this->bo->contacts->is_contact($GLOBALS['phpgw_info']['user']['account_id']));
                                }
                                else
                                {
                                        $add_owner = array('owner' => 
$this->bo->save_owner);
+                                       _debug_array($add_owner);  echo 
"something wrong here? line:". __LINE__ . ' in ' . __FILE__ ;
                                }
                                
                                for ($d=1; $d<=$days; $d++)
@@ -1494,6 +1495,8 @@
                        );
 
                        // check how many lines are needed for this "row" 
(currently: user or category)
+
+                       $rows[$index.'_1']['._name'] = 
(isset($rows[$index.'_1']['._name'])?$rows[$index.'_1']['._name']:'');
                        $i = 0;
                        do {
                                ++$i;
@@ -1707,9 +1710,8 @@
                                reset($this->planner_group_members);
                                while(list($user_name,$id) = 
each($this->planner_group_members))
                                {
-                                       $status = $event['participants'][$id];
-
-                                       if (isset($status) && $status != 'R')
+                                       $status = 
(isset($event['participants'][$id])?$event['participants'][$id]:'');
+                                       if ($status && $status != 'R')
                                        {
                                                
$this->planner_update_row($user_name,$user_name,$event,$cat,$start_cell,$end_cell);
                                        }
@@ -1734,7 +1736,8 @@
                                        if (!isset($rows[$k]))
                                        {
                                                $rows[$k]['_name'] = $user_name;
-                                               $rows[$k]['._name'] .= ' 
nowrap';
+                               //              $rows[$k]['._name'] .= ' 
nowrap';
+                                               $rows[$k]['._name'] = ' nowrap';
                                                $rows[$ka] = 0;
                                        }
                                }