Some tweaks to SMTP auth to allow a site-wide user/pass override

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index b9bda84df5614a4645cee030fe205ec5fbb676d5..2c5317f434c8d85d19b53f56beed63450775379d 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -1462,16 +1462,8 @@ function deliverMessage($composeMessage, $draft=false) {
         $deliver = new Deliver_SMTP();
         global $smtpServerAddress, $smtpPort, $pop_before_smtp, $smtp_auth_mech;
 
-        if ($smtp_auth_mech == 'none') {
-                $user = '';
-                $pass = '';
-        } else {
-                global $key, $onetimepad;
-                $user = $username;
-                $pass = OneTimePadDecrypt($key, $onetimepad);
-        }
-
         $authPop = (isset($pop_before_smtp) && $pop_before_smtp) ? true : false;
+        get_smtp_user($user, $pass);
         $stream = $deliver->initStream($composeMessage,$domain,0,
                           $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
     } elseif (!$draft) {