remove PHPMailer and related directives from config.php-dist; add pluggable Mailer class

1 files changed, 18 insertions, 28 deletions

diff --git a/config.php-dist b/config.php-dist
index ac4e098c5..c179469b5 100755
--- a/config.php-dist
+++ b/config.php-dist
@@ -23,7 +23,7 @@
 	// location of tt-rss directory, e.g. http://example.org/tt-rss/
 	// You need to set this option correctly otherwise several features
 	// including PUSH, bookmarklets and browser integration will not work properly.
-	
+
 	define('SINGLE_USER_MODE', false);
 	// Operate in single user mode, disables all functionality related to
 	// multiple users and authentication. Enabling this assumes you have
@@ -31,11 +31,11 @@
 
 	define('SIMPLE_UPDATE_MODE', false);
 	// Enables fallback update mode where tt-rss tries to update feeds in
-	// background while tt-rss is open in your browser. 
-	// If you don't have a lot of feeds and don't want to or can't run 
-	// background processes while not running tt-rss, this method is generally 
+	// background while tt-rss is open in your browser.
+	// If you don't have a lot of feeds and don't want to or can't run
+	// background processes while not running tt-rss, this method is generally
 	// viable to keep your feeds up to date.
-	// Still, there are more robust (and recommended) updating methods 
+	// Still, there are more robust (and recommended) updating methods
 	// available, you can read about them here: http://tt-rss.org/wiki/UpdatingFeeds
 
 	// *****************************
@@ -43,10 +43,10 @@
 	// *****************************
 
 	define('PHP_EXECUTABLE', '/usr/bin/php');
-	// Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss 
-	// programs and update daemon. Do not try to use CGI binary here, it won't work. 
-	// If you see HTTP headers being displayed while running tt-rss scripts, 
-	// then most probably you are using the CGI binary. If you are unsure what to 
+	// Path to PHP *COMMAND LINE* executable, used for various command-line tt-rss
+	// programs and update daemon. Do not try to use CGI binary here, it won't work.
+	// If you see HTTP headers being displayed while running tt-rss scripts,
+	// then most probably you are using the CGI binary. If you are unsure what to
 	// put in here, ask your hosting provider.
 
 	define('LOCK_DIRECTORY', 'lock');
@@ -84,7 +84,7 @@
 
 	define('FORCE_ARTICLE_PURGE', 0);
 	// When this option is not 0, users ability to control feed purging
-	// intervals is disabled and all articles (which are not starred) 
+	// intervals is disabled and all articles (which are not starred)
 	// older than this amount of days are purged.
 
 	// ****************************
@@ -119,15 +119,18 @@
 	// **********************************
 	// *** Cookies and login sessions ***
 	// **********************************
-	
+
 	define('SESSION_COOKIE_LIFETIME', 86400);
-	// Default lifetime of a session (e.g. login) cookie. In seconds, 
+	// Default lifetime of a session (e.g. login) cookie. In seconds,
 	// 0 means cookie will be deleted when browser closes.
 
 	// *********************************
 	// *** Email and digest settings ***
 	// *********************************
 
+	// Tiny Tiny RSS sends mail via PHP mail() function, unless handled
+	// by a plugin.
+
 	define('SMTP_FROM_NAME', 'Tiny Tiny RSS');
 	define('SMTP_FROM_ADDRESS', '[email protected]');
 	// Name, address and subject for sending outgoing mail. This applies
@@ -136,26 +139,13 @@
 	define('DIGEST_SUBJECT', '[tt-rss] New headlines for last 24 hours');
 	// Subject line for email digests
 
-	define('SMTP_SERVER', '');
-	// Hostname:port combination to send outgoing mail (i.e. localhost:25). 
-	// Blank - use system MTA.
-	
-	define('SMTP_LOGIN', '');
-	define('SMTP_PASSWORD', '');
-	// These two options enable SMTP authentication when sending
-	// outgoing mail. Only used with SMTP_SERVER.
-
-	define('SMTP_SECURE', '');
-	// Used to select a secure SMTP connection. Allowed values: ssl, tls,
-	// or empty.
-	
 	// ***************************************
 	// *** Other settings (less important) ***
 	// ***************************************
 
 	define('CHECK_FOR_UPDATES', true);
 	// Check for updates automatically if running Git version
- 
+
 	define('ENABLE_GZIP_OUTPUT', false);
 	// Selectively gzip output to improve wire performance. This requires
 	// PHP Zlib extension on the server.
@@ -171,11 +161,11 @@
 	// disable plugins specified in this list.
 	// Disabling auth_internal in this list would automatically disable
 	// reset password link on the login form.
-	
+
 	define('LOG_DESTINATION', 'sql');
 	// Error log destination to use. Possible values: sql (uses internal logging
 	// you can read in Preferences -> System), syslog - logs to system log.
-	// Setting this to blank uses PHP logging (usually to http server 
+	// Setting this to blank uses PHP logging (usually to http server
 	// error.log).
 	// Note that feed updating daemons don't use this logging facility
 	// for normal output.