From fd8c5061097f156da55a9cee8972aa4f13daa7b1 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 14 Nov 2005 23:55:46 +0000
Subject: SMTPS support and minor bugfixes

---
 program/steps/mail/compose.inc  | 9 +++++++++
 program/steps/mail/sendmail.inc | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'program/steps/mail')

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 93fae66ef..9509b492b 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -583,6 +583,15 @@ function format_email_recipient($email, $name='')
   }
 
 
+function rcmail_charset_pulldown($selected='ISO-8859-1')
+  {
+  $select = new select();
+  
+  
+  return $select->show($selected);
+  }
+
+
 /****** get contacts for this user and add them to client scripts ********/
 
 $sql_result = $DB->query("SELECT name, email
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index c5505c948..4d7afb5ec 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -259,7 +259,7 @@ if ($CONFIG['smtp_log'])
                $mailto,
                $msg_subject);
 
-  if ($fp = fopen($INSTALL_PATH.'logs/sendmail', 'a'))
+  if ($fp = fopen($CONFIG['log_dir'].'/sendmail', 'a'))
     {
     fwrite($fp, $log_entry);
     fclose($fp);
-- 
cgit v1.2.3