[Phpgroupware-cvs] CVS: phpgwapi/inc class.auth_mail.inc.php,1.10,1.11 class.common.inc.php,1.151,1.152

[Mark A Peters <address@hidden>]

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

Modified Files:
        class.auth_mail.inc.php class.common.inc.php 
Log Message:
GNU Patch #290.

Index: class.auth_mail.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.auth_mail.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** class.auth_mail.inc.php     25 Sep 2001 14:52:10 -0000      1.10
--- class.auth_mail.inc.php     17 Sep 2002 02:47:35 -0000      1.11
***************
*** 44,47 ****
--- 44,55 ----
                                $GLOBALS['phpgw_info']['server']['mail_port'] = 
'110';
                        }
+                       elseif 
($GLOBALS['phpgw_info']['server']['mail_server_type']=='imaps')
+                       {
+                               $GLOBALS['phpgw_info']['server']['mail_port'] = 
'993';
+                       }
+                       elseif 
($GLOBALS['phpgw_info']['server']['mail_server_type']=='pop3s')
+                       {
+                               $GLOBALS['phpgw_info']['server']['mail_port'] = 
'995';
+                       }
  
                        if( 
$GLOBALS['phpgw_info']['server']['mail_server_type']=='pop3')
***************
*** 49,52 ****
--- 57,72 ----
                                $mailauth = 
imap_open('{'.$GLOBALS['phpgw_info']['server']['mail_server'].'/pop3'
                                        
.':'.$GLOBALS['phpgw_info']['server']['mail_port'].'}INBOX', $username , 
$passwd);
+                       }
+                       elseif ( 
$GLOBALS['phpgw_info']['server']['mail_server_type']=='imaps' )
+                       {
+                               // IMAPS support:
+                               $mailauth = 
imap_open('{'.$GLOBALS['phpgw_info']['server']['mail_server']."/ssl/novalidate-cert"
+                                          .':993}INBOX', $username , $passwd);
+                       }
+                       elseif ( 
$GLOBALS['phpgw_info']['server']['mail_server_type']=='pop3s' )
+                       {
+                               // POP3S support:
+                               $mailauth = 
imap_open('{'.$GLOBALS['phpgw_info']['server']['mail_server']."/ssl/novalidate-cert"
+                                          .':995}INBOX', $username , $passwd);
                        }
                        else

Index: class.common.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.common.inc.php,v
retrieving revision 1.151
retrieving revision 1.152
diff -C2 -r1.151 -r1.152
*** class.common.inc.php        17 Aug 2002 19:28:09 -0000      1.151
--- class.common.inc.php        17 Sep 2002 02:47:35 -0000      1.152
***************
*** 1864,1867 ****
--- 1864,1875 ----
                                $prefs['email']['mail_port'] = '110';
                        }
+                       elseif ($prefs['email']['mail_server_type']=='imaps')
+                       {
+                               $prefs['email']['mail_port'] = '993';
+                       }
+                       elseif ($prefs['email']['mail_server_type']=='pop3s')
+                       {
+                               $prefs['email']['mail_port'] = '995';
+                       }
                        // This is going to be used to switch to the nntp class
                        if (isset($GLOBALS['phpgw_info']['flags']['newsmode']) 
&&