mailing sytem admin

This commit is contained in:
Etienne Roudeix
2013-10-28 12:24:59 +01:00
parent 223b39b6c1
commit 2eb5fc821c
12 changed files with 653 additions and 65 deletions

View File

@@ -52,7 +52,7 @@ class MailerFactory {
if($transporterEvent->hasTransporter()) {
$transporter = $transporterEvent->getTransporter();
} else {
if (ConfigQuery::read("smtp.enabled")) {
if (ConfigQuery::isSmtpEnable()) {
$transporter = $this->configureSmtp();
} else {
$transporter = \Swift_MailTransport::newInstance();
@@ -65,14 +65,14 @@ class MailerFactory {
private function configureSmtp()
{
$smtpTransporter = new \Swift_SmtpTransport();
$smtpTransporter->setHost(Configquery::read('smtp.host', 'localhost'))
->setPort(ConfigQuery::read('smtp.host'))
->setEncryption(ConfigQuery::read('smtp.encryption'))
->setUsername(ConfigQuery::read('smtp.username'))
->setPassword(ConfigQuery::read('smtp.password'))
->setAuthMode(ConfigQuery::read('smtp.authmode'))
->setTimeout(ConfigQuery::read('smtp.timeout', 30))
->setSourceIp(ConfigQuery::read('smtp.sourceip'))
$smtpTransporter->setHost(Configquery::getSmtpHost())
->setPort(ConfigQuery::getSmtpPort())
->setEncryption(ConfigQuery::getSmtpEncryption())
->setUsername(ConfigQuery::getSmtpUsername())
->setPassword(ConfigQuery::getSmtpPassword())
->setAuthMode(ConfigQuery::getSmtpAuthMode())
->setTimeout(ConfigQuery::getSmtpTimeout())
->setSourceIp(ConfigQuery::getSmtpSourceIp())
;
return $smtpTransporter;
}