email authentication bugs fix

o2system · Aug 23, 2020 · cbb937a · cbb937a
1 parent fae833a
commit cbb937a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/Protocols/SmtpProtocol.php b/src/Protocols/SmtpProtocol.php
@@ -45,7 +45,7 @@ public function __construct(Spool $spool)
 
         $this->config = $this->spool->getConfig();
 
-        if ( ! $this->config->offsetExists('debug')) {
+        if ( ! isset($this->config['debug'])) {
             /**
              * Debug output level.
              * Options:
@@ -58,7 +58,7 @@ public function __construct(Spool $spool)
             $this->config[ 'debug' ] = 0;
         }
 
-        if ( ! $this->config->offsetExists('auth')) {
+        if ( ! isset($this->config['auth'])) {
             $this->config[ 'auth' ] = false;
             if ( ! empty($this->config[ 'username' ])) {
                 $this->config[ 'auth' ] = true;
@@ -98,11 +98,12 @@ protected function sending(Message $message)
             $phpMailer->AuthType = $this->config['auth'];
         }
 
-        $phpMailer->Username = $this->config[ 'username' ];
-        $phpMailer->Password = $this->config[ 'password' ];
         $phpMailer->SMTPSecure = $this->config[ 'encryption' ];
         $phpMailer->Port = $this->config[ 'port' ];
 
+        $phpMailer->Username = $this->config[ 'username' ];
+        $phpMailer->Password = $this->config[ 'password' ];
+
         // Set from
         if (false !== ($from = $message->getFrom())) {
             $phpMailer->setFrom($from->getEmail(), $from->getName());

diff --git a/src/Spool.php b/src/Spool.php
@@ -64,7 +64,7 @@ public function __construct(Config $config = null)
      */
     public function send(Message $message)
     {
-        $protocolClass = '\O2System\Email\Protocols\\' . ucfirst($this->config->offsetGet('protocol')) . 'Protocol';
+        $protocolClass = '\O2System\Email\Protocols\\' . ucfirst($this->config['protocol']) . 'Protocol';
 
         if (class_exists($protocolClass)) {
             $protocol = new $protocolClass($this);