From e34e0fd2fa4806a06d92eef1b281f38242a9868a Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Fri, 26 Jul 2013 13:32:40 +0200 Subject: Update SMTP.php remove sensless version_compare(). Min PHP Version is 5.2.1 so is a check of PHP 5.1.0 sensless. So never occurs. --- program/lib/Net/SMTP.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/program/lib/Net/SMTP.php b/program/lib/Net/SMTP.php index 2c1ef5c55..02575955b 100644 --- a/program/lib/Net/SMTP.php +++ b/program/lib/Net/SMTP.php @@ -595,8 +595,7 @@ class Net_SMTP * extension, are connected to an SMTP server which supports the * STARTTLS extension, and aren't already connected over a secure * (SSL) socket connection. */ - if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') && - extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) && + if ($tls && extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) && strncasecmp($this->host, 'ssl://', 6) !== 0) { /* Start the TLS connection attempt. */ if (PEAR::isError($result = $this->_put('STARTTLS'))) { -- cgit v1.2.3 From 60a79649f2a5f85d82af923e48cdf1cc895e9b10 Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Fri, 26 Jul 2013 13:33:44 +0200 Subject: Update Socket.php remove sensless version_compare(). Min PHP Version is 5.2.1 so is a check of PHP 5.1.0 sensless. So never occurs. --- program/lib/Net/Socket.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/program/lib/Net/Socket.php b/program/lib/Net/Socket.php index bf1d1bbcd..a67a11af1 100644 --- a/program/lib/Net/Socket.php +++ b/program/lib/Net/Socket.php @@ -672,15 +672,10 @@ class Net_Socket extends PEAR */ function enableCrypto($enabled, $type) { - if (version_compare(phpversion(), "5.1.0", ">=")) { - if (!is_resource($this->fp)) { - return $this->raiseError('not connected'); - } - return @stream_socket_enable_crypto($this->fp, $enabled, $type); - } else { - $msg = 'Net_Socket::enableCrypto() requires php version >= 5.1.0'; - return $this->raiseError($msg); + if (!is_resource($this->fp)) { + return $this->raiseError('not connected'); } + return @stream_socket_enable_crypto($this->fp, $enabled, $type); } } -- cgit v1.2.3 From ac1fa9871567473f34e3b400496ae08e9b6c0461 Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Fri, 26 Jul 2013 13:35:10 +0200 Subject: Update rcube_imap_generic.php remove sensless version_compare(). Min PHP Version is 5.2.1 so is a check of PHP 5.1.0 sensless. So never occurs. --- program/lib/Roundcube/rcube_imap_generic.php | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/program/lib/Roundcube/rcube_imap_generic.php b/program/lib/Roundcube/rcube_imap_generic.php index 920c7184a..5787f36b6 100644 --- a/program/lib/Roundcube/rcube_imap_generic.php +++ b/program/lib/Roundcube/rcube_imap_generic.php @@ -800,23 +800,21 @@ class rcube_imap_generic // TLS connection if ($this->prefs['ssl_mode'] == 'tls' && $this->getCapability('STARTTLS')) { - if (version_compare(PHP_VERSION, '5.1.0', '>=')) { - $res = $this->execute('STARTTLS'); + $res = $this->execute('STARTTLS'); - if ($res[0] != self::ERROR_OK) { - $this->closeConnection(); - return false; - } - - if (!stream_socket_enable_crypto($this->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) { - $this->setError(self::ERROR_BAD, "Unable to negotiate TLS"); - $this->closeConnection(); - return false; - } + if ($res[0] != self::ERROR_OK) { + $this->closeConnection(); + return false; + } - // Now we're secure, capabilities need to be reread - $this->clearCapability(); + if (!stream_socket_enable_crypto($this->fp, true, STREAM_CRYPTO_METHOD_TLS_CLIENT)) { + $this->setError(self::ERROR_BAD, "Unable to negotiate TLS"); + $this->closeConnection(); + return false; } + + // Now we're secure, capabilities need to be reread + $this->clearCapability(); } // Send ID info -- cgit v1.2.3 From e9505469030cd5cfd0930c8f12c855057a32cad4 Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Fri, 26 Jul 2013 18:38:13 +0200 Subject: Update SMTP.php --- program/lib/Net/SMTP.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/program/lib/Net/SMTP.php b/program/lib/Net/SMTP.php index 02575955b..2c1ef5c55 100644 --- a/program/lib/Net/SMTP.php +++ b/program/lib/Net/SMTP.php @@ -595,7 +595,8 @@ class Net_SMTP * extension, are connected to an SMTP server which supports the * STARTTLS extension, and aren't already connected over a secure * (SSL) socket connection. */ - if ($tls && extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) && + if ($tls && version_compare(PHP_VERSION, '5.1.0', '>=') && + extension_loaded('openssl') && isset($this->_esmtp['STARTTLS']) && strncasecmp($this->host, 'ssl://', 6) !== 0) { /* Start the TLS connection attempt. */ if (PEAR::isError($result = $this->_put('STARTTLS'))) { -- cgit v1.2.3 From d52a77a10d7eb0ea36543e59a11a6704f20f8605 Mon Sep 17 00:00:00 2001 From: Dennis1993 Date: Fri, 26 Jul 2013 18:41:09 +0200 Subject: Update Socket.php --- program/lib/Net/Socket.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/program/lib/Net/Socket.php b/program/lib/Net/Socket.php index a67a11af1..bf1d1bbcd 100644 --- a/program/lib/Net/Socket.php +++ b/program/lib/Net/Socket.php @@ -672,10 +672,15 @@ class Net_Socket extends PEAR */ function enableCrypto($enabled, $type) { - if (!is_resource($this->fp)) { - return $this->raiseError('not connected'); + if (version_compare(phpversion(), "5.1.0", ">=")) { + if (!is_resource($this->fp)) { + return $this->raiseError('not connected'); + } + return @stream_socket_enable_crypto($this->fp, $enabled, $type); + } else { + $msg = 'Net_Socket::enableCrypto() requires php version >= 5.1.0'; + return $this->raiseError($msg); } - return @stream_socket_enable_crypto($this->fp, $enabled, $type); } } -- cgit v1.2.3