Fix logic/doc typos

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
index 27b9eff..36de4a0 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php
@@ -1459,7 +1459,7 @@ abstract class Horde_Imap_Client_Base
      * Key: Horde_Imap_Client::FETCH_HEADERTEXT
      *   Desc: Returns the header text. Header text is defined only for the
      *         base RFC 2822 message or message/rfc822 parts. Attempting to
-     *         retireve the body text from other parts will result in a
+     *         retrieve the body text from other parts will result in a
      *         thrown exception.
      *         MORE THAN ONE of these entries can be defined. Each entry will
      *         be a separate array contained in the value field.
@@ -1492,7 +1492,7 @@ abstract class Horde_Imap_Client_Base
      * Key: Horde_Imap_Client::FETCH_BODYTEXT
      *   Desc: Returns the body text. Body text is defined only for the
      *         base RFC 2822 message or message/rfc822 parts. Attempting to
-     *         retireve the body text from other parts will result in a
+     *         retrieve the body text from other parts will result in a
      *         thrown exception.
      *         MORE THAN ONE of these entries can be defined. Each entry will
      *         be a separate array contained in the value field.

diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
index c6c612c..d408d0d 100644 (file)
--- a/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
+++ b/framework/Imap_Client/lib/Horde/Imap/Client/Socket.php
@@ -12,7 +12,7 @@
  *   RFC 2195 - AUTH=CRAM-MD5
  *   RFC 2221 - LOGIN-REFERRALS
  *   RFC 2342 - NAMESPACE
- *   RFC 2595/4616 - AUTH=PLAIN
+ *   RFC 2595/4616 - TLS & AUTH=PLAIN
  *   RFC 2831 - DIGEST-MD5 authentication mechanism.
  *   RFC 2971 - ID
  *   RFC 3501 - IMAP4rev1 specification
@@ -318,8 +318,8 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
             }
 
             /* Use MD5 authentication first, if available. But no need to use
-             * use special authentication if we are already using an
-             * encrypted connection. */
+             * special authentication if we are already using an encrypted
+             * connection. */
             if ($this->_isSecure) {
                 $imap_auth_mech = array_reverse($imap_auth_mech);
             }
@@ -492,7 +492,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
             switch ($method) {
             case 'CRAM-MD5':
                 // RFC 2195
-                if (class_exists('Auth_SASL')) {
+                if (!class_exists('Auth_SASL')) {
                     throw new Horde_Imap_Client_Exception('The Auth_SASL package is required for CRAM-MD5 authentication');
                 }
                 $auth_sasl = Auth_SASL::factory('crammd5');
@@ -501,7 +501,7 @@ class Horde_Imap_Client_Socket extends Horde_Imap_Client_Base
                 break;
 
             case 'DIGEST-MD5':
-                if (class_exists('Auth_SASL')) {
+                if (!class_exists('Auth_SASL')) {
                     throw new Horde_Imap_Client_Exception('The Auth_SASL package is required for DIGEST-MD5 authentication');
                 }
                 $auth_sasl = Auth_SASL::factory('digestmd5');