unify SMTP_HOST and SMTP_PORT as SMTP_SERVER

diff --git a/classes/ttrssmailer.php b/classes/ttrssmailer.php
index 1eb9f1d3a2fa14e409db68d2b29664f030345b10..1f365c22ed87e7c9083c07620223e1c6bf159f6b 100644 (file)
--- a/classes/ttrssmailer.php
+++ b/classes/ttrssmailer.php
@@ -25,17 +25,20 @@ class ttrssMailer extends PHPMailer {
 \r
        function __construct() {\r
                $this->SetLanguage("en", "lib/phpmailer/language/");\r
-               //if SMTP_HOST is specified, use SMTP to send mail directly\r
+\r
                if (SMTP_HOST) {\r
-                       $Host = SMTP_HOST;\r
+                       $pair = explode(":", SMTP_HOST, 2);\r
                        $Mailer = "smtp";\r
+\r
+                       $Host = $pair[0];\r
+                       $Port = $pair[1];\r
+\r
+                       if (!$Port) $Port = 25;\r
+               } else {\r
+                       $Host = '';\r
+                       $Port = '';\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
+\r
 \r
                //if SMTP_LOGIN is specified, set credentials and enable auth\r
                if(SMTP_LOGIN){\r

diff --git a/config.php-dist b/config.php-dist
index fc999354bdb8b3808f86d411cb1b9b3ccc7522a2..5366120af6ce94b34676fd2e93a0e83e62b89ca9 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -160,12 +160,10 @@
        define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
        // Subject line for email digests
 
-       define('SMTP_HOST', '');
-       // SMTP Host to send outgoing mail. Blank - use system MTA.
+       define('SMTP_SERVER', '');
+       // Hostname:port combination to send outgoing mail (i.e. localhost:25). 
+       // Blank - use system MTA.
        
-       define('SMTP_PORT','');
-       // SMTP port to sent outgoing mail. Default is 25.
-
        define('SMTP_LOGIN', '');
        define('SMTP_PASSWORD', '');
        // These two options enable SMTP authentication when sending

diff --git a/include/sanity_config.php b/include/sanity_config.php
index 0c829981ea9ea9b2d8d53923470f0d273269d1ab..255b404d69432a19dd9f517826905c936f207885 100644 (file)
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Sat Apr 13 17:41:19 MSK 2013
+<?php # This file has been generated at:  Tue Apr 16 16:38:38 MSK 2013
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_PORT', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'FEED_CRYPT_KEY', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_SERVER', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'CONFIG_VERSION'); ?>