From 28010579e84f885656823b9f2cfa3d808498caa0 Mon Sep 17 00:00:00 2001 From: lkehresman Date: Fri, 24 Mar 2000 22:04:58 +0000 Subject: [PATCH] saving sent messages works! git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@336 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- functions/imap_general.php | 8 ++++++-- functions/smtp.php | 25 ++++++++++--------------- src/right_main.php | 1 - 3 files changed, 16 insertions(+), 18 deletions(-) diff --git a/functions/imap_general.php b/functions/imap_general.php index f4b4e347..a8cde1dd 100755 --- a/functions/imap_general.php +++ b/functions/imap_general.php @@ -236,7 +236,11 @@ ** Saves a message to a given folder -- used for saving sent messages ******************************************************************************/ function sqimap_append ($imap_stream, $sent_folder, $length) { - fputs ($imap_stream, "a001 APPEND $sent_folder (\\Seen) \{$length}\r\n"); - $read_ary = sqimap_read_data ($imap_stream, "a001", true, $result, $message); + fputs ($imap_stream, "a001 APPEND $sent_folder (\\Seen) \{$length}\n"); + $tmp = fgets ($imap_stream, 1024); } + + function sqimap_append_done ($imap_stream) { + fputs ($imap_stream, "\r\n"); + } ?> diff --git a/functions/smtp.php b/functions/smtp.php index 75af97bb..73561ee1 100644 --- a/functions/smtp.php +++ b/functions/smtp.php @@ -254,7 +254,7 @@ function sendSMTP($t, $c, $b, $subject, $body) { global $username, $domain, $version, $smtpServerAddress, $smtpPort, - $data_dir; + $data_dir, $color; $to = parseAddrs($t); $cc = parseAddrs($c); @@ -316,7 +316,7 @@ $tmp = nl2br(htmlspecialchars(fgets($smtpConnection, 1024))); $num = errorCheck($tmp); if ($num != 250) { - echo "ERROR
Message not sent!
Reason given: $tmp
"; + echo "ERROR
Message not sent!
Reason given: $tmp
"; } fputs($smtpConnection, "QUIT\r\n"); // log off @@ -328,6 +328,7 @@ function errorCheck($line) { + global $color; // Status: 0 = fatal // 5 = ok @@ -409,7 +410,7 @@ } if ($status == 0) { - echo ""; + echo ""; echo ""; echo " ERROR "; echo " Error Number: $err_num "; @@ -432,18 +433,12 @@ $length = sendSMTP($t, $c, $b, $subject, $body); } - - // This is a proposed interface to save messages in the sent folder - // -- gustavf - // -// $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1); -// sqimap_append ($imap_stream, $sent_folder, $length); -// write822Header ($imap_stream, $t, $c, $b, $subject); -// writeBody ($imap_stream, $body); - //sqimap_append_done($imap_stream); - // - // Or something like that... - + $imap_stream = sqimap_login($username, $key, $imapServerAddress, $imapPort, 1); + sqimap_append ($imap_stream, $sent_folder, $length); + write822Header ($imap_stream, $t, $c, $b, $subject); + writeBody ($imap_stream, $body); + sqimap_append_done ($imap_stream); + // Delete the files uploaded for attaching (if any). deleteAttachments(); diff --git a/src/right_main.php b/src/right_main.php index b35d0b70..4379dc03 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -63,7 +63,6 @@ /** If it was a successful login, lets load their preferences **/ include("../src/load_prefs.php"); echo "\n"; - echo ""; // If the page has been loaded without a specific mailbox, // just show a page of general info. -- 2.25.1