[Phpgroupware-cvs] CVS: email addressbook.php,1.32.2.1,1.32.2.2 attach_file.php,1.24,1.24.2.1 view_image.php,1.13,1.13.2.1

[Dan Kuykendall <address@hidden>]

Update of /cvsroot/phpgroupware/email
In directory subversions:/tmp/cvs-serv13626

Modified Files:
      Tag: Version-0_9_14-branch
        addressbook.php attach_file.php view_image.php 
Log Message:
minor cleanups of some code, and removal of some unneeded comments and 
commented out code

Index: addressbook.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/addressbook.php,v
retrieving revision 1.32.2.1
retrieving revision 1.32.2.2
diff -C2 -r1.32.2.1 -r1.32.2.2
*** addressbook.php     14 Feb 2002 06:42:43 -0000      1.32.2.1
--- addressbook.php     14 Feb 2002 06:57:22 -0000      1.32.2.2
***************
*** 33,37 ****
        
        $include_personal = True;
-       //$include_personal = False;
        
        $charset = $GLOBALS['phpgw']->translation->translate('charset');
--- 33,36 ----

Index: attach_file.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/attach_file.php,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -r1.24 -r1.24.2.1
*** attach_file.php     28 Dec 2001 11:55:51 -0000      1.24
--- attach_file.php     14 Feb 2002 06:57:22 -0000      1.24.2.1
***************
*** 226,230 ****
        }
  
-       /*
        // begin DEBUG INFO
        $debuginfo .= '--uploadedfile info: <br>'
--- 226,229 ----
***************
*** 245,251 ****
        }
        $debuginfo .= '<br>';
!       echo $debuginfo;
        // end DEBUG INFO
-       */
  
        $charset = lang('charset');
--- 244,249 ----
        }
        $debuginfo .= '<br>';
!       print_debug('$debuginfo', $debuginfo);
        // end DEBUG INFO
  
        $charset = lang('charset');

Index: view_image.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/view_image.php,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -C2 -r1.13 -r1.13.2.1
*** view_image.php      28 Dec 2001 07:19:36 -0000      1.13
--- view_image.php      14 Feb 2002 06:57:22 -0000      1.13.2.1
***************
*** 21,35 ****
        );
        include('../header.inc.php');
  
!       //  if (isset($GLOBALS['phpgw_info']['flags']['newsmode']) && 
$GLOBALS['phpgw_info']['flags']['newsmode'])
!       //    $GLOBALS['phpgw']->common->read_preferences('nntp');
!       //  set_time_limit(0);
! 
!       // //  echo 'Mailbox = '.$mailbox.'<br>'."\n";
!       //  echo 'Mailbox = 
'.$GLOBALS['phpgw']->msg->mailsvr_stream.'<br>'."\n";
!       //  echo 'Msgnum = '.$m.'<br>'."\n";
!       //  echo 'Part Number = '.$p.'<br>'."\n";
!       //  echo 'Subtype = '.$s.'<br>'."\n";
! 
        //$data = 
$GLOBALS['phpgw']->dcom->fetchbody($GLOBALS['phpgw']->msg->mailsvr_stream, $m, 
$p);
        $data = $GLOBALS['phpgw']->msg->phpgw_fetchbody($p);
--- 21,37 ----
        );
        include('../header.inc.php');
+       /*
+       if (isset($GLOBALS['phpgw_info']['flags']['newsmode']) && 
$GLOBALS['phpgw_info']['flags']['newsmode'])
+       {
+               $GLOBALS['phpgw']->common->read_preferences('nntp');
+       }
+       set_time_limit(0);
  
!       echo 'Mailbox = '.$mailbox.'<br>'."\n";
!       echo 'Mailbox = '.$GLOBALS['phpgw']->msg->mailsvr_stream.'<br>'."\n";
!       echo 'Msgnum = '.$m.'<br>'."\n";
!       echo 'Part Number = '.$p.'<br>'."\n";
!       echo 'Subtype = '.$s.'<br>'."\n";
!       */
        //$data = 
$GLOBALS['phpgw']->dcom->fetchbody($GLOBALS['phpgw']->msg->mailsvr_stream, $m, 
$p);
        $data = $GLOBALS['phpgw']->msg->phpgw_fetchbody($p);