Add option to allow insecure SSL

action.php

@@ -55,7 +55,8 @@ public function handle_mail_message_send(Doku_Event &$event, $param) {
         $smtp->setServer(
             $this->getConf('smtp_host'),
             $this->getConf('smtp_port'),
-            $this->getConf('smtp_ssl')
+            $this->getConf('smtp_ssl'),
+            $this->getConf('smtp_ssl_allow_insecure')
         );
         if($this->getConf('auth_user')){
             $smtp->setAuth(

classes/Message.php

@@ -41,7 +41,7 @@ public function getFromEmail() {
     }
 
     /**
-     * Get a list of all recipients (mail only part)
+     * Get a list of all recipients (array of email => name, name is omitted)
      *
      * @return array
      */
@@ -51,16 +51,19 @@ public function getTo() {
         // We need the mail only part of all recipients
         $addresses = explode(',', $this->rcpt);
         foreach($addresses as $addr) {
-            // parse address
+            // Parse address
+            $parsedAddr = '';
             if(preg_match('#(.*?)<(.*?)>#', $addr, $matches)) {
-                $rcpt[] = trim($matches[2]);
+                $parsedAddr = trim($matches[2]);
             } else {
-                $rcpt[] = trim($addr);
+                $parsedAddr = trim($addr);
+            }
+            // Insert only non-empty address
+            if (!empty($parsedAddr)) {
+                $rcpt[$parsedAddr] = '';
             }
         }
 
-        $rcpt = array_filter($rcpt);
-        $rcpt = array_unique($rcpt);
         return $rcpt;
     }
 

conf/default.php

@@ -3,6 +3,7 @@
 $conf['smtp_host'] = 'localhost';
 $conf['smtp_port'] = 25;
 $conf['smtp_ssl']  = '';
+$conf['smtp_ssl_allow_insecure'] = 0;
 
 $conf['localdomain'] = '';
 

conf/metadata.php

@@ -3,6 +3,7 @@
 $meta['smtp_host'] = array('string');
 $meta['smtp_port'] = array('numeric');
 $meta['smtp_ssl']  = array('multichoice','_choices' => array('','ssl','tls'));
+$meta['smtp_ssl_allow_insecure'] = array('onoff');
 
 $meta['auth_user'] = array('string');
 $meta['auth_pass'] = array('password');

lang/en/settings.php

@@ -8,6 +8,8 @@
 $lang['smtp_ssl_o_ssl']   = 'SSL';
 $lang['smtp_ssl_o_tls']   = 'TLS';
 
+$lang['smtp_ssl_allow_insecure'] = 'Allow insecure SSL';
+
 $lang['auth_user'] = 'If authentication is required, put your user name here.';
 $lang['auth_pass'] = 'Password for the above user.';
 

lang/zh/settings.php

@@ -8,6 +8,8 @@
 $lang['smtp_ssl_o_ssl']   = 'SSL';
 $lang['smtp_ssl_o_tls']   = 'TLS';
 
+$lang['smtp_ssl_allow_insecure'] = '允许不安全的SSL';
+
 $lang['auth_user'] = '如果需要认证，在这里输入您的用户名。';
 $lang['auth_pass'] = '对应上面用户名的密码。';
 

subtree/txtthinking/Mailer/.gitattributes

@@ -0,0 +1,8 @@
+* text=auto
+
+/tests export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/phpunit.xml.dist export-ignore
+/README.md export-ignore

subtree/txtthinking/Mailer/.gitignore

@@ -2,3 +2,4 @@ vendor/
 composer.lock
 .idea/
 docs/
+phpunit.xml

subtree/txtthinking/Mailer/.travis.yml

@@ -0,0 +1,11 @@
+language: php
+sudo: false
+php:
+  - "7.4"
+  - "7.3"
+  - "7.2"
+  - "7.1"
+  - "7.0"
+  - "5.6"
+install: composer update
+script: ./vendor/bin/phpunit --verbose

subtree/txtthinking/Mailer/README.md

@@ -7,6 +7,8 @@ A lightweight SMTP mail sender
 
 ```
 $ composer require txthinking/mailer
+# or
+$ composer require txthinking/mailer:dev-master
 ```
 
 ### Usage
@@ -16,36 +18,16 @@ $ composer require txthinking/mailer
 use Tx\Mailer;
 
 $ok = (new Mailer())
-    ->setServer('smtp.ym.163.com', 25)
-    ->setAuth('', '') // email, password
-    ->setFrom('You', '') //your name, your email
-    ->setFakeFrom('heelo', 'bot@fake.com') // if u want, a fake name, a fake email
-    ->addTo('Cloud', 'cloud@txthinking.com')
-    ->setSubject('Test Mailer')
-    ->setBody('Hi, I <strong>love</strong> you.')
+    ->setServer('smtp.server.com', 25)
+    ->setAuth('[email protected]', 'password')
+    ->setFrom('Tom', '[email protected]')
+    ->setFakeFrom('Obama', 'fake@address.com') // if u want, a fake name, a fake email
+    ->addTo('Jerry', 'jerry@server.com')
+    ->setSubject('Hello')
+    ->setBody('Hi, Jerry! I <strong>love</strong> you.')
     ->addAttachment('host', '/etc/hosts')
     ->send();
 var_dump($ok);
 ```
-OR
-```
-<?php
-use \Tx\Mailer\SMTP;
-use \Tx\Mailer\Message;
-use \Monolog\Logger;
-
-$smtp = new SMTP(); // new SMTP(new Logger('Mailer')); # set logger to receive debug log
-$smtp->setServer('smtp.ym.163.com', 25)
-    ->setAuth('[email protected]', ''); // email, password
+More [Example](https://github.com/txthinking/Mailer/tree/master/tests)
 
-$message = new Message();
-$message->setFrom('Tom', '[email protected]') // your name, your email
-    ->setFakeFrom('heelo', '[email protected]') // if u want, a fake name, a fake email
-    ->addTo('Cloud', '[email protected]')
-    ->setSubject('Test Mailer')
-    ->setBody('<h1>For test</h1>')
-    ->addAttachment('host', '/etc/hosts');
-
-$ok = $smtp->send($message);
-var_dump($ok);
-```

subtree/txtthinking/Mailer/composer.json

@@ -22,8 +22,7 @@
         "psr/log": "~1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0",
-        "erb/testing-tools": "dev-master",
+        "phpunit/phpunit": "~5.0",
         "monolog/monolog": "~1.13"
     },
     "autoload": {