mail plugin: use system from address

[tt-rss.git] / classes / ttrssmailer.php

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 1b450c50ce93ff521de81dbcc5b25769a4063bf1..64e8a59a75784a554cae8d45a540e1f2a5eab347 100644 (file)
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -17,32 +17,32 @@ class ttrssMailer extends PHPMailer {
                public $CharSet = "UTF-8";\r
                public $PluginDir = "lib/phpmailer/";\r
                public $ContentType = "text/html"; //default email type is HTML\r
-               public $Host;\r
-               public $Port;\r
-               public $SMTPAuth=False;\r
-               public $Username;\r
-               public $Password;\r
-       \r
+\r
        function __construct() {\r
                $this->SetLanguage("en", "lib/phpmailer/language/");\r
-               //if SMTP_HOST is specified, use SMTP to send mail directly\r
-               if (SMTP_HOST) {\r
-                       $Host = SMTP_HOST;\r
-                       $Mailer = "smtp";\r
-               }\r
-               //if SMTP_PORT is specified, assign it. Otherwise default to port 25\r
-               if(SMTP_PORT){\r
-                       $Port = SMTP_PORT;\r
-               }else{\r
-                       $Port = "25";\r
+\r
+               if (SMTP_SERVER) {\r
+                       $pair = explode(":", SMTP_SERVER, 2);\r
+                       $this->Mailer = "smtp";\r
+\r
+                       $this->Host = $pair[0];\r
+                       $this->Port = $pair[1];\r
+\r
+                       if (!$this->Port) $this->Port = 25;\r
+               } else {\r
+                       $this->Host = '';\r
+                       $this->Port = '';\r
                }\r
-               \r
+\r
+\r
                //if SMTP_LOGIN is specified, set credentials and enable auth\r
                if(SMTP_LOGIN){\r
-                       $SMTPAuth = true;\r
-                       $Username = SMTP_LOGIN;\r
-                       $Password = SMTP_PASSWORD;\r
+                       $this->SMTPAuth = true;\r
+                       $this->Username = SMTP_LOGIN;\r
+                       $this->Password = SMTP_PASSWORD;\r
                        }\r
+               if(SMTP_SECURE)
+                       $this->SMTPSecure = SMTP_SECURE;        
        }\r
        /*      @brief a simple mail function to send email using the defaults\r
        *       This will send an HTML email using the configured defaults\r
@@ -55,9 +55,10 @@ class ttrssMailer extends PHPMailer {
                $this->addAddress($toAddress, $toName);\r
                $this->Subject = $subject;\r
                $this->Body = $body;\r
+               $this->IsHTML($altbody != '');\r
                $rc=$this->send();\r
                return $rc;\r
        }\r
 }\r
 \r
-?>
\ No newline at end of file
+?>\r