[Phpgroupware-cvs] CVS: phpgwapi/inc class.msg.inc.php,1.1,1.2

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv30783

Modified Files:
        class.msg.inc.php 
Log Message:
format, fix banner

Index: class.msg.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.msg.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** class.msg.inc.php   6 May 2002 09:05:44 -0000       1.1
--- class.msg.inc.php   26 May 2002 20:12:08 -0000      1.2
***************
*** 1,27 ****
  <?php
        
/**************************************************************************\
!       * phpGroupWare API - php IMAP SO access object constructor              
        *
!       * This file written by Mark Peters <address@hidden>                     
*
!       * and Angelo Tony Puglisi (Angles) <address@hidden>             *
!       * Handles initializing the appropriate class dcom object                
                *
!       * Copyright (C) 2001 Mark Peters                                        
                *
!       * 
-------------------------------------------------------------------------       
              *
!       * This library is part of the phpGroupWare API                          
        *
!       * http://www.phpgroupware.org/api                                       
        * 
!       * 
------------------------------------------------------------------------        
              *
!       * This library is free software; you can redistribute it and/or modify 
it               *
!       * under the terms of the GNU Lesser General Public License as published 
by      *
!       * the Free Software Foundation; either version 2.1 of the License,      
        *
!       * or any later version.                                                 
        *
!       * This library is distributed in the hope that it will be useful, but   
        *
!       * WITHOUT ANY WARRANTY; without even the implied warranty of            
*
!       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  *
!       * See the GNU Lesser General Public License for more details.           
        *
!       * You should have received a copy of the GNU Lesser General Public 
License      *
!       * along with this library; if not, write to the Free Software 
Foundation,       *
!       * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA         
*
        
\**************************************************************************/
  
!       if (isset($p1)  && ($p1) && ( (stristr($p1, 'imap') || stristr($p1, 
'pop') || stristr($p1, 'nntp'))))
        {
                $msg_server_type = $p1;
--- 1,28 ----
  <?php
        
/**************************************************************************\
!       * phpGroupWare API - php IMAP SO access object constructor              
   *
!       * 
------------------------------------------------------------------------ *
!       * This file written by Mark Peters <address@hidden>              *
!       * and Angelo Tony Puglisi (Angles) <address@hidden>               *
!       * Handles initializing the appropriate class dcom object                
   *
!       * Copyright (C) 2001 Mark Peters                                        
   *
!       * 
------------------------------------------------------------------------ *
!       * This library is part of the phpGroupWare API                          
   *
!       * http://www.phpgroupware.org/api                                       
   * 
!       * 
------------------------------------------------------------------------ *
!       * This library is free software; you can redistribute it and/or modify 
it  *
!       * under the terms of the GNU Lesser General Public License as published 
by *
!       * the Free Software Foundation; either version 2.1 of the License,      
   *
!       * or any later version.                                                 
   *
!       * This library is distributed in the hope that it will be useful, but   
   *
!       * WITHOUT ANY WARRANTY; without even the implied warranty of            
   *
!       * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  
   *
!       * See the GNU Lesser General Public License for more details.           
   *
!       * You should have received a copy of the GNU Lesser General Public 
License *
!       * along with this library; if not, write to the Free Software 
Foundation,  *
!       * Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA         
   *
        
\**************************************************************************/
  
!       if(isset($p1) && ($p1) && ((stristr($p1, 'imap') || stristr($p1, 'pop') 
|| stristr($p1, 'nntp'))))
        {
                $msg_server_type = $p1;
***************
*** 57,65 ****
        
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_base'.$sock_fname.'.inc.php');
  
!       if (($msg_server_type == 'imap')        || ($msg_server_type == 
'imaps'))
!   {
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_imap'.$sock_fname.'.inc.php');
        }
!       elseif (($msg_server_type == 'pop3')    || ($msg_server_type == 
'pop3s'))
        {
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_pop3'.$sock_fname.'.inc.php');
--- 58,66 ----
        
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_base'.$sock_fname.'.inc.php');
  
!       if (($msg_server_type == 'imap') || ($msg_server_type == 'imaps'))
!       {
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_imap'.$sock_fname.'.inc.php');
        }
!       elseif (($msg_server_type == 'pop3') || ($msg_server_type == 'pop3s'))
        {
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_pop3'.$sock_fname.'.inc.php');
***************
*** 69,77 ****
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_nntp'.$sock_fname.'.inc.php');
        }
!       elseif ((isset($msg_server_type))       && ($msg_server_type != ''))
        {
                // educated guess based on info being available:
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_'.$GLOBALS['phpgw_info']['user']['preferences']['email']['msg_server_type'].$sock_fname.'.inc.php');
!       }
        else
        {
--- 70,78 ----
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_nntp'.$sock_fname.'.inc.php');
        }
!       elseif ((isset($msg_server_type)) && ($msg_server_type != ''))
        {
                // educated guess based on info being available:
                
include(PHPGW_INCLUDE_ROOT.'/phpgwapi/inc/class.msg_'.$GLOBALS['phpgw_info']['user']['preferences']['email']['msg_server_type'].$sock_fname.'.inc.php');
!       }
        else
        {