diff options
| author | robocoder <anthon.pang@gmail.com> | 2010-10-28 03:36:54 +0400 |
|---|---|---|
| committer | robocoder <anthon.pang@gmail.com> | 2010-10-28 03:36:54 +0400 |
| commit | 41a0cacab49ba977683dae54e07a2706a3bc6d54 (patch) | |
| tree | e4dda25948b508353e1ecab4e2f354c13b437fe4 /core/Mail.php | |
| parent | 9c6d1e3f5f2940693b8b1dcfd07f2d066e83d55a (diff) | |
fixes #1676 - add "SMTP encryption" selection in General Settings which sets the 'ssl' option in the transport-layer. Added some more help text.
git-svn-id: http://dev.piwik.org/svn/trunk@3268 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'core/Mail.php')
| -rw-r--r-- | core/Mail.php | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/core/Mail.php b/core/Mail.php index 4dbac28cb4..526cd083de 100644 --- a/core/Mail.php +++ b/core/Mail.php @@ -49,15 +49,17 @@ class Piwik_Mail extends Zend_Mail return; } $smtpConfig = array(); - if ( !empty($config->auth->type) - || !empty($config->auth->username) - || !empty($config->auth->password) + if ( !empty($config->type) + || !empty($config->username) + || !empty($config->password) + || !empty($config->security) ) { $smtpConfig = array( - 'auth' => $config->auth->type, - 'username' => $config->auth->username, - 'password' => $config->auth->password + 'auth' => $config->type, + 'username' => $config->username, + 'password' => $config->password, + 'ssl' => $config->security, ); } |