From 5a299aaaa343ed85e8914e57e32d8eee611d3427 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Tue, 3 May 2011 02:35:56 +0000
Subject: [PATCH]  + add the type of encoding datas.

---
 module/mail/config.php | 1 +
 module/mail/model.php  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/module/mail/config.php b/module/mail/config.php
index d6d2b33449..f30b6c718d 100644
--- a/module/mail/config.php
+++ b/module/mail/config.php
@@ -11,6 +11,7 @@ if($config->mail->mta == 'smtp')
     $config->mail->smtp->auth     = true;       // Need auth or not.
     $config->mail->smtp->host     = '';         // The smtp server host address.
     $config->mail->smtp->port     = '';         // The smtp server host port.
+    $config->mail->smtp->secure   = '';         // The type to encode datas, 'ssl' or 'tls' allowed
     $config->mail->smtp->username = '';         // The smtp user, may be a full email adress.
     $config->mail->smtp->password = '';         // The smtp user's password.
 }
diff --git a/module/mail/model.php b/module/mail/model.php
index 93f0237fa3..f02451a8a8 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -56,6 +56,7 @@ class mailModel extends model
         $this->mta->Username  = $this->config->mail->smtp->username;
         $this->mta->Password  = $this->config->mail->smtp->password;
         if(isset($this->config->mail->smtp->port)) $this->mta->Port = $this->config->mail->smtp->port;
+        if(empty($this->config->mail->smtp->secure))$this->mta->SMTPSecure = strtolower($this->config->mail->smtp->secure);
     }
 
     /**