| @@ -35,7 +35,6 @@ | ||
| 35 | 35 | use Fisharebest\Webtrees\Menu; | 
| 36 | 36 | use Fisharebest\Webtrees\Module; | 
| 37 | 37 | use Fisharebest\Webtrees\Stats; | 
| 38 | -use Fisharebest\Webtrees\Theme; | |
| 39 | 38 | use Fisharebest\Webtrees\Tree; | 
| 40 | 39 | use PDO; | 
| 41 | 40 | |
| @@ -16,8 +16,8 @@ | ||
| 16 | 16 | namespace Fisharebest\Webtrees; | 
| 17 | 17 | |
| 18 | 18 | use Exception; | 
| 19 | -use Swift_Mailer; | |
| 20 | 19 | use Swift_MailTransport; | 
| 20 | +use Swift_Mailer; | |
| 21 | 21 | use Swift_Message; | 
| 22 | 22 | use Swift_NullTransport; | 
| 23 | 23 | use Swift_SmtpTransport; | 
| @@ -46,15 +46,15 @@ discard block | ||
| 46 | 46 | */ | 
| 47 | 47 |  	public static function send(Tree $tree, $to_email, $to_name, $replyto_email, $replyto_name, $subject, $body_html, $body_text) { | 
| 48 | 48 |  		try { | 
| 49 | - $mail = Swift_Message::newInstance() | |
| 50 | - ->setSubject($subject) | |
| 51 | -                ->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) | |
| 52 | - ->setTo($to_email, $to_name) | |
| 53 | - ->setReplyTo($replyto_email, $replyto_name) | |
| 54 | - ->setBody($body_html, 'text/html') | |
| 55 | - ->addPart($body_text, 'text/plain'); | |
| 49 | + $mail = Swift_Message::newInstance() | |
| 50 | + ->setSubject($subject) | |
| 51 | +								->setFrom(Site::getPreference('SMTP_FROM_NAME'), $tree->getPreference('title')) | |
| 52 | + ->setTo($to_email, $to_name) | |
| 53 | + ->setReplyTo($replyto_email, $replyto_name) | |
| 54 | + ->setBody($body_html, 'text/html') | |
| 55 | + ->addPart($body_text, 'text/plain'); | |
| 56 | 56 | |
| 57 | - Swift_Mailer::newInstance(self::transport())->send($mail); | |
| 57 | + Swift_Mailer::newInstance(self::transport())->send($mail); | |
| 58 | 58 |  		} catch (Exception $ex) { | 
| 59 | 59 |  			Log::addErrorLog('Mail: ' . $ex->getMessage()); | 
| 60 | 60 | |
| @@ -96,20 +96,20 @@ discard block | ||
| 96 | 96 | case 'internal': | 
| 97 | 97 | return Swift_MailTransport::newInstance(); | 
| 98 | 98 | case 'external': | 
| 99 | - $transport = Swift_SmtpTransport::newInstance() | |
| 100 | -                ->setHost(Site::getPreference('SMTP_HOST')) | |
| 101 | -                ->setPort(Site::getPreference('SMTP_PORT')) | |
| 102 | -                ->setLocalDomain(Site::getPreference('SMTP_HELO')); | |
| 99 | + $transport = Swift_SmtpTransport::newInstance() | |
| 100 | +								->setHost(Site::getPreference('SMTP_HOST')) | |
| 101 | +								->setPort(Site::getPreference('SMTP_PORT')) | |
| 102 | +								->setLocalDomain(Site::getPreference('SMTP_HELO')); | |
| 103 | 103 | |
| 104 | -            if (Site::getPreference('SMTP_AUTH')) { | |
| 105 | - $transport | |
| 106 | -                    ->setUsername(Site::getPreference('SMTP_AUTH_USER')) | |
| 107 | -                    ->setPassword(Site::getPreference('SMTP_AUTH_PASS')); | |
| 108 | - } | |
| 104 | +						if (Site::getPreference('SMTP_AUTH')) { | |
| 105 | + $transport | |
| 106 | +										->setUsername(Site::getPreference('SMTP_AUTH_USER')) | |
| 107 | +										->setPassword(Site::getPreference('SMTP_AUTH_PASS')); | |
| 108 | + } | |
| 109 | 109 | |
| 110 | -            if (Site::getPreference('SMTP_SSL') !== 'none') { | |
| 111 | -                $transport->setEncryption(Site::getPreference('SMTP_SSL')); | |
| 112 | - } | |
| 110 | +						if (Site::getPreference('SMTP_SSL') !== 'none') { | |
| 111 | +								$transport->setEncryption(Site::getPreference('SMTP_SSL')); | |
| 112 | + } | |
| 113 | 113 | |
| 114 | 114 | return $transport; | 
| 115 | 115 | default: |