Merge pull request #69 from OPUS4/emailauth66

#66 Support auth options for mail
OPUS4 · Aug 15, 2022 · 261c917 · 261c917
2 parents 37522a3 + f313bc1
commit 261c917
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/src/Mail/MailException.php b/src/Mail/MailException.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2009-2020, OPUS 4 development team
+ * @copyright   Copyright (c) 2009, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -34,7 +34,7 @@
 use Exception;
 
 /**
- * Extends default Exception class.
+ * Exception for mail related problems.
  */
 class MailException extends Exception
 {

diff --git a/src/Mail/SendMail.php b/src/Mail/SendMail.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2011-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2011, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 

diff --git a/src/Mail/Transport.php b/src/Mail/Transport.php
@@ -25,7 +25,7 @@
  * along with OPUS; if not, write to the Free Software Foundation, Inc., 51
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * @copyright   Copyright (c) 2011-2018, OPUS 4 development team
+ * @copyright   Copyright (c) 2011, OPUS 4 development team
  * @license     http://www.gnu.org/licenses/gpl.html General Public License
  */
 
@@ -35,8 +35,14 @@
 use Zend_Config;
 use Zend_Mail_Transport_Smtp;
 
+use function array_flip;
+use function array_intersect_key;
+
 /**
- * Override
+ * mail.opus.auth = ;
+ * mail.opus.username = ;
+ * main.opus.password = ;
+ * main.opus.ssl = ;
  */
 class Transport extends Zend_Mail_Transport_Smtp
 {
@@ -57,14 +63,28 @@ public function __construct($config = null)
             $smtp = '127.0.0.1';
         }
 
-        $port = 25;
+        if ($config !== null) {
+            $options = $config->toArray();
+        } else {
+            $options = [];
+        }
 
-        if (isset($config->port)) {
-            $port = $config->port;
+        if (! isset($options['port'])) {
+            $options['port'] = 25;
         }
 
-        Log::get()->info(self::class . " Using mail server {$smtp}:{$port}");
+        $allowedOptions = [
+            'port',
+            'auth',
+            'username',
+            'password',
+            'ssl',
+        ];
+
+        $options = array_intersect_key($options, array_flip($allowedOptions));
+
+        Log::get()->info(self::class . " Using mail server {$smtp}:{$options['port']}");
 
-        parent::__construct($smtp, ['port' => $port]);
+        parent::__construct($smtp, $options);
     }
 }
diff --git a/test/Mail/TransportTest.php b/test/Mail/TransportTest.php
@@ -61,7 +61,7 @@ public function tearDown()
     {
     }
 
-    public function testConstructorWoConfig()
+    public function testConstructorWithoutConfig()
     {
         $transport = new Transport();
     }
@@ -75,4 +75,9 @@ public function testConstructorWithConfig()
 
         $transport = new Transport($config);
     }
+
+    public function testAuthConfig()
+    {
+        $this->markTestIncomplete('not tested');
+    }
 }