[Phpgroupware-cvs] CVS: calendar/inc class.bocalendar.inc.php,1.71,1.71.2.1

[Mark A Peters <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.bocalendar.inc.php 
Log Message:
Better handling of debugging statements.

Index: class.bocalendar.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/calendar/inc/class.bocalendar.inc.php,v
retrieving revision 1.71
retrieving revision 1.71.2.1
diff -C2 -r1.71 -r1.71.2.1
*** class.bocalendar.inc.php    12 Jan 2002 01:33:40 -0000      1.71
--- class.bocalendar.inc.php    13 Apr 2002 01:31:04 -0000      1.71.2.1
***************
*** 127,130 ****
--- 127,131 ----
  
                var $today;
+               var $debug_string;
  
                function bocalendar($session=0)
***************
*** 133,146 ****
  
                        @reset($this->grants);
                        if($this->debug)
                        {
                                while(list($grantor,$rights) = 
each($this->grants))
                                {
                                        echo '<!-- Grantor: '.$grantor.' 
Rights: '.$rights.' -->'."\n";
                                }
!                               @reset($this->grantor);
                        }
  
!                       if($this->debug) { echo '<!-- Read Use_Session : 
('.$session.') -->'."\n"; }
  
                        if($session)
--- 134,157 ----
  
                        @reset($this->grants);
+ 
                        if($this->debug)
                        {
+                               if(floor(phpversion()) >= 4)
+                               {
+                                       $this->debug_string = '';
+                                       ob_start();
+                               }       
+ 
                                while(list($grantor,$rights) = 
each($this->grants))
                                {
                                        echo '<!-- Grantor: '.$grantor.' 
Rights: '.$rights.' -->'."\n";
                                }
!                               @reset($this->grants);
                        }
  
!                       if($this->debug)
!                       {
!                               echo '<!-- Read Use_Session : ('.$session.') 
-->'."\n";
!                       }
  
                        if($session)
***************
*** 261,265 ****
                        $this->datetime = $this->so->datetime;
                        
!                       $this->today = date('Ymd',time());
  
                        if($this->debug)
--- 272,276 ----
                        $this->datetime = $this->so->datetime;
                        
!                       $this->today = gmdate('Ymd',time());
  
                        if($this->debug)
***************
*** 267,270 ****
--- 278,288 ----
                                echo '<!-- BO Filter : ('.$this->filter.') 
-->'."\n";
                                echo '<!-- Owner : '.$this->owner.' -->'."\n";
+                               echo '<!-- Today is : '.$this->today.' 
-->'."\n";
+ 
+                               if(floor(phpversion()) >= 4)
+                               {
+                                       $this->debug_string .= 
ob_get_contents();
+                                       ob_end_clean();
+                               }
                        }
                }
***************
*** 373,377 ****
                        if ($this->use_session)
                        {
!                               if($this->debug) { echo '<br>Save:'; 
_debug_array($data); }
                                
$GLOBALS['phpgw']->session->appsession('session_data','calendar',$data);
                        }
--- 391,409 ----
                        if ($this->use_session)
                        {
!                               if($this->debug)
!                               {
!                                       if(floor(phpversion()) >= 4)
!                                       {
!                                               ob_start();
!                                       }
!                                       echo '<!-- '."\n".'Save:';
!                                       _debug_array($data);
!                                       echo ' -->'."\n";
!                                       if(floor(phpversion()) >= 4)
!                                       {
!                                               $this->debug_string .= 
ob_get_contents();
!                                               ob_end_clean();
!                                       }
!                               }
                                
$GLOBALS['phpgw']->session->appsession('session_data','calendar',$data);
                        }
***************
*** 381,385 ****
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','calendar');
!                       if($this->debug) { echo '<br>Read:'; 
_debug_array($data); }
  
                        $this->filter = $data['filter'];
--- 413,422 ----
                {
                        $data = 
$GLOBALS['phpgw']->session->appsession('session_data','calendar');
!                       if($this->debug)
!                       {
!                               echo '<!-- '."\n".'Read:';
!                               _debug_array($data);
!                               echo ' -->'."\n";
!                       }
  
                        $this->filter = $data['filter'];