From: friendica Date: Wed, 28 Mar 2012 21:54:00 +0000 (-0700) Subject: bug #349 - email notls setting X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4fe0b56d765d98b79592cf855d72e823d4478854;p=friendica.git bug #349 - email notls setting --- diff --git a/boot.php b/boot.php index e0ab98bde5..9582372ca1 100755 --- 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 99bf8842d2..db7330fb59 100755 --- 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'),