[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.73,1.74 class.uicalendar.inc.php,1.74,1.75

[Mark A Peters <address@hidden>]

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

Modified Files:
        class.bocalendar.inc.php class.uicalendar.inc.php 
Log Message:
Small fixes, GNU Patch #264, and now puts printer friendly format with more 
details.

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -r1.73 -r1.74
*** class.bocalendar.inc.php    16 Apr 2002 16:20:22 -0000      1.73
--- class.bocalendar.inc.php    19 Apr 2002 14:02:31 -0000      1.74
***************
*** 131,135 ****
                {
                        $this->grants = 
$GLOBALS['phpgw']->acl->get_grants('calendar');
- 
                        @reset($this->grants);
                        if($this->debug)
--- 131,134 ----
***************
*** 206,210 ****
                        );
                        $this->datetime = $this->so->datetime;
-                       
                        $localtime = $this->datetime->gmtnow + 
$this->datetime->tz_offset;
  
--- 205,208 ----
***************
*** 375,379 ****
                                echo '<!-- 
'."\n".'Read:'."\n"._debug_array($data,False)."\n".' -->'."\n";
                        }
!                       
                        $this->filter = $data['filter'];
                        $this->cat_id = $data['cat_id'];
--- 373,377 ----
                                echo '<!-- 
'."\n".'Read:'."\n"._debug_array($data,False)."\n".' -->'."\n";
                        }
! 
                        $this->filter = $data['filter'];
                        $this->cat_id = $data['cat_id'];
***************
*** 1236,1244 ****
                function get_short_field($event,$is_private=True,$field='')
                {
!                       if ($is_private)
                        {
                                return 'private';
                        }
!                       elseif (strlen($event[$field]) > 19)
                        {
                                return substr($event[$field], 0 , 19) . '...';
--- 1234,1242 ----
                function get_short_field($event,$is_private=True,$field='')
                {
!                       if($is_private)
                        {
                                return 'private';
                        }
!                       elseif(strlen($event[$field]) > 19 && 
!$this->printer_friendly)
                        {
                                return substr($event[$field], 0 , 19) . '...';

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -r1.74 -r1.75
*** class.uicalendar.inc.php    17 Apr 2002 23:43:29 -0000      1.74
--- class.uicalendar.inc.php    19 Apr 2002 14:02:31 -0000      1.75
***************
*** 1948,1952 ****
                                . '  .event-off { background: 
'.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
                                . '  .event-holiday { background: 
'.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
!                               . '  .time { background: 
'.$this->theme['navbar_bg'].'; color: '.$this->theme['bg_text'].'; font: 
65%/100% '.$this->theme['font'].'; width: '.$time_width.'%; border: 1px 
'.$this->theme['navbar_text'].'; vertical-align: middle; }'."\n"
                                . '  .tablecell { width: 80px; height: 80px }';
                }
--- 1948,1952 ----
                                . '  .event-off { background: 
'.$this->theme['row_off'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
                                . '  .event-holiday { background: 
'.$this->theme['bg04'].'; color: '.$this->theme['bg_text'].'; font: 100 
80%/110% '.$this->theme['font'].'; vertical-align: middle }'."\n"
!                               . '  .time { background: 
'.$this->theme['navbar_bg'].'; color: '.$this->theme['bg_text'].'; font: 
65%/100% '.$this->theme['font'].'; width: '.$time_width.'%; border: 1px 
'.$this->theme['navbar_text'].'; vertical-align: middle }'."\n"
                                . '  .tablecell { width: 80px; height: 80px }';
                }
***************
*** 2022,2026 ****
                                $time = '';
                        }
!                       $text = '';;
                        if(!$is_private)
                        {
--- 2022,2026 ----
                                $time = '';
                        }
!                       $text = '';
                        if(!$is_private)
                        {
***************
*** 2028,2032 ****
                        }
                        $text = '<font size="-2" 
face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr>&nbsp;'.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br;
!               
                        if ($editable)
                        {
--- 2028,2032 ----
                        }
                        $text = '<font size="-2" 
face="'.$this->theme['font'].'"><nobr>'.$time.'</nobr>&nbsp;'.$this->bo->get_short_field($event,$is_private,'title').$text.'</font>'.$GLOBALS['phpgw']->browser->br;
! 
                        if ($editable)
                        {
***************
*** 2100,2103 ****
--- 2100,2107 ----
                                }
                        }
+                       else
+                       {
+                               $text .= '<font size="-2" 
face="'.$this->theme['font'].'">'.nl2br($this->bo->get_short_field($event,$is_private,'description')).'</font>'.$GLOBALS['phpgw']->browser->br;
+                       }
                        if ($text)
                        {
***************
*** 2564,2568 ****
                function view_event($event,$alarms=False)
                {
!                       if(!$event['participants'][$this->bo->owner] && 
!$this->bo->member_of_group())
                        {
                                return '<center>'.lang('You do not have 
permission to read this record!').'</center>';
--- 2568,2572 ----
                function view_event($event,$alarms=False)
                {
!                       if((!$event['participants'][$this->bo->owner] && 
!$this->bo->member_of_group()) || (!$event['public'] && 
!$this->bo->check_perms(PHPGW_ACL_PRIVATE)))
                        {
                                return '<center>'.lang('You do not have 
permission to read this record!').'</center>';