Fix issue salesagility#9457 where test outbound email does not work w…

…hen opened

If password is not set, get mailbox using smtp user email address

include/OutboundEmail/OutboundEmail.php

@@ -142,6 +142,26 @@ public function createUserSystemOverrideAccount($user_id, $user_name = "", $user
         return $ob;
     }
 
+    /**
+     * Get mailer by using mailboxes smtp user
+     *
+     * @param string $email
+     * @return OutboundEmail|false
+     */
+    public function getMailerByEmail($email)
+    {
+        $query = "SELECT id FROM outbound_email WHERE mail_smtpuser = '{$email}' AND deleted = 0";
+        $rs = $this->db->query($query);
+        $row = $this->db->fetchByAssoc($rs);
+        if (!empty($row['id'])) {
+            $oe = new OutboundEmail();
+            $oe->retrieve($row['id']);
+            return $oe;
+        } else {
+            return null;
+        }
+    }
+
     /**
      * Determines if a user needs to set their user name/password for their system
      * override account.

modules/EmailMan/testOutboundEmail.php

@@ -59,13 +59,12 @@
     $pass = $_REQUEST['mail_smtppass'];
 } elseif (isset($_REQUEST['mail_type'])) {
     $oe = new OutboundEmail();
-    if (is_admin($current_user) && $_REQUEST['mail_type'] == 'system') {
-        $oe = $oe->getSystemMailerSettings();
-    } else {
-        $oe = $oe->getMailerByName($current_user, $_REQUEST['mail_type']);
-    }
-    if (!empty($oe)) {
+    if (!empty($oe) && !empty($_REQUEST["mail_smtpuser"])) {
+        $oe = $oe->getMailerByEmail($_REQUEST["mail_smtpuser"]);
         $pass = $oe->mail_smtppass;
+    }else{
+        //if pw cannot be retrieved, use system default
+        $oe = $oe->getSystemMailerSettings();
     }
 }
 $email = BeanFactory::newBean('Emails');