[Phpgroupware-cvs] CVS: calendar/inc class.uicalendar.inc.php,1.66.2.3,1.66.2.4

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.uicalendar.inc.php 
Log Message:
Better handling of printer friendly generated pages.

Index: class.uicalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.uicalendar.inc.php,v
retrieving revision 1.66.2.3
retrieving revision 1.66.2.4
diff -C2 -r1.66.2.3 -r1.66.2.4
*** class.uicalendar.inc.php    14 Mar 2002 00:11:01 -0000      1.66.2.3
--- class.uicalendar.inc.php    6 Apr 2002 16:57:57 -0000       1.66.2.4
***************
*** 276,280 ****
                                        .'</STYLE>'."\n"
                                        .'</head>'."\n"
!                                       .$body
                                        .'</body>'."\n"
                                        .'</html>'."\n";
--- 276,280 ----
                                        .'</STYLE>'."\n"
                                        .'</head>'."\n"
!                                       .$this->bo->debug_string.$body
                                        .'</body>'."\n"
                                        .'</html>'."\n";
***************
*** 282,294 ****
                        else
                        {
-                               $new_body = $body;
-                       }
-                       return $new_body;
-               }
- 
-               function month()
-               {
-                       if (!$this->bo->printer_friendly)
-                       {
                                
unset($GLOBALS['phpgw_info']['flags']['noheader']);
                                
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
--- 282,285 ----
***************
*** 296,300 ****
--- 287,297 ----
                                
unset($GLOBALS['phpgw_info']['flags']['noappfooter']);
                                $GLOBALS['phpgw']->common->phpgw_header();
+                               $new_body = $this->bo->debug_string.$body;
                        }
+                       return $new_body;
+               }
+ 
+               function month()
+               {
                        echo $this->printer_friendly($this->get_month());
                }
***************
*** 369,378 ****
                function week()
                {
-                       if (!$this->bo->printer_friendly)
-                       {
-                               
unset($GLOBALS['phpgw_info']['flags']['noheader']);
-                               
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-                               $GLOBALS['phpgw']->common->phpgw_header();
-                       }
                        echo $this->printer_friendly($this->get_week());
                }
--- 366,369 ----
***************
*** 542,552 ****
                function year()
                {
!                       if(!$this->bo->printer_friendly)
!                       {
!                               
unset($GLOBALS['phpgw_info']['flags']['noheader']);
!                               
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
!                               $GLOBALS['phpgw']->common->phpgw_header();
!                       }
!                       else
                        {
                                $GLOBALS['phpgw_info']['flags']['nofooter'] = 
True;
--- 533,537 ----
                function year()
                {
!                       if($this->bo->printer_friendly)
                        {
                                $GLOBALS['phpgw_info']['flags']['nofooter'] = 
True;
***************
*** 1149,1155 ****
                        if (!$this->bo->printer_friendly)
                        {
-                               
unset($GLOBALS['phpgw_info']['flags']['noheader']);
-                               
unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
-                               $GLOBALS['phpgw']->common->phpgw_header();
                                $printer = '';
                                $param = 
'&date='.sprintf("%04d%02d%02d",$this->bo->year,$this->bo->month,$this->bo->day).'&friendly=1';
--- 1134,1137 ----
***************
*** 2322,2325 ****
--- 2304,2308 ----
                        }
                        $today = date('Ymd',time());
+ //                    $today = gmdate('Ymd');
                        $daily = 
$this->set_week_array($startdate,$cellcolor,$weekly);
                        @reset($daily);
***************
*** 3619,3623 ****
                                        if ($date == $this->bo->today)
                                        {
!                                               $day_image = ' 
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block.gif').'"';
                                        }
                                }
--- 3602,3606 ----
                                        if ($date == $this->bo->today)
                                        {
!                                               $day_image = ' 
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
                                        }
                                }
***************
*** 3631,3635 ****
                                        $extra = ' 
bgcolor="'.$GLOBALS['phpgw_info']['theme']['cal_today'].'"';
                                        $class = ($appts?'b':'').'minicalendar';
!                                       $day_image = ' 
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block.gif').'"';
                                }
  
--- 3614,3618 ----
                                        $extra = ' 
bgcolor="'.$GLOBALS['phpgw_info']['theme']['cal_today'].'"';
                                        $class = ($appts?'b':'').'minicalendar';
!                                       $day_image = ' 
background="'.$GLOBALS['phpgw']->common->image('calendar','mini_day_block').'"';
                                }