Changeset 1031 in subversion

Timestamp:

Feb 8, 2008 12:18:32 PM (5 years ago)

Author:

thomasb

Message:

Distinguish ssl and tls for imap connections (#1484667)

Location:

trunk/roundcubemail/program

Files:

• include/main.inc (modified) (1 diff)
• include/rcube_imap.inc (modified) (2 diffs)
• lib/imap.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -563 +563 @@
     {
     $host = $a_host['host'];
-    $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? TRUE : FALSE;
+    $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;
     $imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
     }

trunk/roundcubemail/program/include/rcube_imap.inc

@@ -98 +98 @@
    * @param  string   Password for IMAP account
    * @param  number   Port to connect to
-   * @param  boolean  Use SSL connection
+   * @param  string   SSL schema (either ssl or tls) or null if plain connection
    * @return boolean  TRUE on success, FALSE on failure
    * @access public
    */
-  function connect($host, $user, $pass, $port=143, $use_ssl=FALSE)
+  function connect($host, $user, $pass, $port=143, $use_ssl=null)
     {
     global $ICL_SSL, $ICL_PORT, $IMAP_USE_INTERNAL_DATE;
@@ -108 +108 @@
     // check for Open-SSL support in PHP build
     if ($use_ssl && in_array('openssl', get_loaded_extensions()))
-      $ICL_SSL = TRUE;
+      $ICL_SSL = $use_ssl == 'imaps' ? 'ssl' : $use_ssl;
     else if ($use_ssl)
       {

trunk/roundcubemail/program/lib/imap.inc

@@ -50 +50 @@
                 - Implemented UID FETCH in iil_C_FetchHeaders()
                 - Abort do-loop on socket errors (fgets returns false)
+                - $ICL_SSL is not boolean anymore but contains the connection schema (ssl or tls)
                 - Removed some debuggers (echo ...)
 
@@ -456 +457 @@
         //check for SSL
         if ($ICL_SSL) {
-                $host = "ssl://".$host;
+                $host = $ICL_SSL."://".$host;
         }