bug #349 - email notls setting

diff --git a/boot.php b/boot.php
index e0ab98bde57c26d8600071ac7469cda7e7dcd045..9582372ca150ae94b67a24345aacc83f5dc5b9c2 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1294' );
+define ( 'FRIENDICA_VERSION',      '2.3.1295' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1133      );
 

diff --git a/mod/settings.php b/mod/settings.php
index 99bf8842d25ac37654906580bb674b68345e9612..db7330fb59ac51e1077a9970d41bfe15fd98e850 100755 (executable)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -618,7 +618,7 @@ function settings_content(&$a) {
                        '$mail_disabled' => (($mail_disabled) ? t('Email access is disabled on this site.') : ''),
                        '$mail_server'  => array('mail_server',  t('IMAP server name:'), $mail_server, ''),
                        '$mail_port'    => array('mail_port',    t('IMAP port:'), $mail_port, ''),
-                       '$mail_ssl'             => array('mail_ssl',     t('Security:'), strtoupper($mail_ssl), '', array( ''=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
+                       '$mail_ssl'             => array('mail_ssl',     t('Security:'), strtoupper($mail_ssl), '', array( 'notls'=>t('None'), 'TLS'=>'TLS', 'SSL'=>'SSL')),
                        '$mail_user'    => array('mail_user',    t('Email login name:'), $mail_user, ''),
                        '$mail_pass'    => array('mail_pass',    t('Email password:'), '', ''),
                        '$mail_replyto' => array('mail_replyto', t('Reply-to address:'), '', 'Optional'),