Add notls in server encryption's support. (#219)

lomotech · Webklex · commit 1c55740408b6 · 2019-06-19T22:04:14.000+02:00
diff --git a/src/IMAP/Client.php b/src/IMAP/Client.php
@@ -58,7 +58,7 @@ class Client {
 
     /**
      * Server encryption.
-     * Supported: none, ssl or tls.
+     * Supported: none, ssl, tls, or notls.
      *
      * @var string
      */
@@ -538,7 +538,7 @@ protected function getAddress() {
         if (!$this->validate_cert) {
             $address .= '/novalidate-cert';
         }
-        if (in_array($this->encryption,['tls','ssl'])) {
+        if (in_array($this->encryption,['tls', 'notls', 'ssl'])) {
             $address .= '/'.$this->encryption;
         }
 
diff --git a/src/config/imap.php b/src/config/imap.php
@@ -39,7 +39,7 @@
             'host'  => env('IMAP_HOST', 'localhost'),
             'port'  => env('IMAP_PORT', 993),
             'protocol'  => env('IMAP_PROTOCOL', 'imap'), //might also use imap, [pop3 or nntp (untested)]
-            'encryption'    => env('IMAP_ENCRYPTION', 'ssl'), // Supported: false, 'ssl', 'tls'
+            'encryption'    => env('IMAP_ENCRYPTION', 'ssl'), // Supported: false, 'ssl', 'tls', 'notls'
             'validate_cert' => env('IMAP_VALIDATE_CERT', true),
             'username' => env('IMAP_USERNAME', 'root@example.com'),
             'password' => env('IMAP_PASSWORD', ''),

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ class Client {`
`58`	`58`
`59`	`59`	`/**`
`60`	`60`	`* Server encryption.`
`61`		`- * Supported: none, ssl or tls.`
	`61`	`+ * Supported: none, ssl, tls, or notls.`
`62`	`62`	`*`
`63`	`63`	`* @var string`
`64`	`64`	`*/`
`@@ -538,7 +538,7 @@ protected function getAddress() {`
`538`	`538`	`if (!$this->validate_cert) {`
`539`	`539`	`$address .= '/novalidate-cert';`
`540`	`540`	`}`
`541`		`- if (in_array($this->encryption,['tls','ssl'])) {`
	`541`	`+ if (in_array($this->encryption,['tls', 'notls', 'ssl'])) {`
`542`	`542`	`$address .= '/'.$this->encryption;`
`543`	`543`	`}`
`544`	`544`