[Phpgroupware-cvs] CVS: email/inc class.mail_dcom.inc.php,1.8,1.8.2.1

[Dan Kuykendall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        class.mail_dcom.inc.php 
Log Message:
removed some unneeded debugging crap

Index: class.mail_dcom.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/email/inc/class.mail_dcom.inc.php,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -r1.8 -r1.8.2.1
*** class.mail_dcom.inc.php     28 Dec 2001 11:55:52 -0000      1.8
--- class.mail_dcom.inc.php     15 Feb 2002 19:45:20 -0000      1.8.2.1
***************
*** 26,30 ****
        $debug_dcom = False;
  
! // -----  any constructor params? ----
        if (isset($p1)
        && ($p1)
--- 26,30 ----
        $debug_dcom = False;
  
!       /* -----  any constructor params? ---- */
        if (isset($p1)
        && ($p1)
***************
*** 32,36 ****
        )
        {
-               //echo 'class dcom constructor, $mail_server_type being set to 
param $p1: ['.$p1.']'.'<br>';
                $mail_server_type = $p1;
        }
--- 32,35 ----
***************
*** 39,52 ****
                $mail_server_type = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'];
        }
-       //if ($debug_dcom)
-       //{
-       //      echo 'class dcom constructor, param $p1: ['.$p1.']'.'<br>';
-       //      echo 'class dcom constructor, 
$mail_server_type='.$mail_server_type.'<br>';
-       //}
  
! 
! // -----  is IMAP compiled into PHP
!       //if (extension_loaded("imap"))
!       //if (defined("TYPEVIDEO"))
        if (extension_loaded('imap') || function_exists('imap_open'))
        {
--- 38,43 ----
                $mail_server_type = 
$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'];
        }
  
!       /* -----  is IMAP compiled into PHP */
        if (extension_loaded('imap') || function_exists('imap_open'))
        {
***************
*** 62,78 ****
        }
  
!       // debug
!       if ($debug_dcom)
!       {
!               $imap_builtin = False;
!               $sock_fname = '_sock';
!               if ($debug_dcom) { echo 'FORCE: imap builtin extension NOT 
available, using socket class<br>'; }
!       }
!       
!       // SILENT DEBUG
!       //$imap_builtin = False;
!       //$sock_fname = '_sock';
! 
! // -----  include SOCKET or PHP-BUILTIN classes as necessary
        if ($imap_builtin == False)
        {
--- 53,57 ----
        }
  
!       /* -----  include SOCKET or PHP-BUILTIN classes as necessary */
        if ($imap_builtin == False)
        {
***************
*** 105,109 ****
        && ($mail_server_type != ''))
        {
!               // educated guess based on info being available:
                
include(PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_'.$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'].$sock_fname.'.inc.php');
                if ($debug_dcom) { echo 'Educated Guess: including 
:'.PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_'.$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'].$sock_fname.'.inc.php<br>';
 }
--- 84,88 ----
        && ($mail_server_type != ''))
        {
!               /* educated guess based on info being available: */
                
include(PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_'.$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'].$sock_fname.'.inc.php');
                if ($debug_dcom) { echo 'Educated Guess: including 
:'.PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_'.$GLOBALS['phpgw_info']['user']['preferences']['email']['mail_server_type'].$sock_fname.'.inc.php<br>';
 }
***************
*** 111,115 ****
        else
        {
!               // DEFAULT FALL BACK:
                
include(PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_imap.inc.php');
                if ($debug_dcom) { echo 'NO INFO DEFAULT: including 
:'.PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_imap.inc.php<br>'; }
--- 90,94 ----
        else
        {
!               /* DEFAULT FALL BACK: */
                
include(PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_imap.inc.php');
                if ($debug_dcom) { echo 'NO INFO DEFAULT: including 
:'.PHPGW_INCLUDE_ROOT.'/email/inc/class.mail_dcom_imap.inc.php<br>'; }