Brought CVS up to date with 1.2.0 rc1

[squirrelmail.git] / functions / smtp.php

diff --git a/functions/smtp.php b/functions/smtp.php
index b8969a11dc1a3c9ee93d289bb758e471cf5541d0..2be15ca8378bd1dea5819c140142ecc93b050a1d 100644 (file)
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -360,8 +360,9 @@
    }
 
    function sendSMTP($t, $c, $b, $subject, $body, $more_headers) {
-      global $username, $popuser, $domain, $version, $smtpServerAddress, $smtpPort,
-         $data_dir, $color, $use_authenticated_smtp, $identity;
+      global $username, $popuser, $domain, $version, $smtpServerAddress, 
+         $smtpPort, $data_dir, $color, $use_authenticated_smtp, $identity, 
+        $key, $onetimepad;
 
       $to = expandAddrs(parseAddrs($t));
       $cc = expandAddrs(parseAddrs($c));
@@ -462,7 +463,6 @@
 
    function errorCheck($line, $smtpConnection, $verbose = false) {
       global $color;
-      include '../functions/page_header.php';
       
       // Read new lines on a multiline response
       $lines = $line;
@@ -553,6 +553,7 @@
       }
 
       if ($status == 0) {
+         include '../functions/page_header.php';
          displayPageHeader($color, 'None');
                 include ("../functions/display_messages.php");
          $lines = nl2br(htmlspecialchars($lines));