Nemcio/Batflat
1
0
Fork 0
mirror of https://github.com/sruupl/batflat.git synced 2026-01-11 00:12:04 +01:00
Code Issues Packages Projects Releases Activity

Merge pull request #50 from michu2k/fix#46

Browse Source 
Updated PHPMailer in the contact module
This commit is contained in:
Paweł Klockiewicz
2019-07-25 20:56:41 +02:00
committed by GitHub
parent 97eaebe585 fdc29d3aec
commit 409b3af77a
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
inc/modules/contact/Site.php
View File

@@ -69,7 +69,7 @@ class Site extends SiteModule
if ($settings['driver'] == 'mail') {
$this->email['sender'] = $this->settings('settings', 'title')." <no-reply@{$_SERVER['HTTP_HOST']}>";
} elseif ($settings['driver'] == 'phpmailer' && class_exists('PHPMailer')) {
} elseif ($settings['driver'] == 'phpmailer' && class_exists('PHPMailer\PHPMailer\PHPMailer')) {
$this->email['sender'] = [
$this->settings('contact', 'phpmailer.username'),
$this->settings('contact', 'phpmailer.name'),
@@ -135,14 +135,14 @@ class Site extends SiteModule
$settings = $this->settings('contact');
try {
$mail = new \PHPMailer(true);
$mail = new \PHPMailer\PHPMailer\PHPMailer(true);
$mail->isSMTP(); // Set mailer to use SMTP
$mail->Host = $settings['phpmailer.server']; // Specify main and backup SMTP servers
$mail->SMTPAuth = true; // Enable SMTP authentication
$mail->Username = $settings['phpmailer.username']; // SMTP username
$mail->Password = $settings['phpmailer.password']; // SMTP password
$mail->SMTPSecure = 'TLS'; // Enable TLS encryption, `ssl` also accepted
$mail->Port = $settings['phpmailer.port']; // TCP port to connect to
$mail->Host = $settings['phpmailer.server']; // Specify main and backup SMTP servers
$mail->SMTPAuth = true; // Enable SMTP authentication
$mail->Username = $settings['phpmailer.username']; // SMTP username
$mail->Password = $settings['phpmailer.password']; // SMTP password
$mail->SMTPSecure = 'TLS'; // Enable TLS encryption, `ssl` also accepted
$mail->Port = $settings['phpmailer.port']; // TCP port to connect to
$mail->CharSet = 'UTF-8';
$mail->Subject = $this->email['subject'];
@@ -166,7 +166,7 @@ class Site extends SiteModule
$cookieParams = session_get_cookie_params();
setcookie("MailWasSend", 'BATFLAT', time()+360, $cookieParams["path"], $cookieParams["domain"], null, true);
}
} catch (\phpmailerException $e) {
} catch (\Exception $e) {
$this->_error = $e->errorMessage();
} catch (\Exception $e) {
$this->_error = $e->getMessage();

2
inc/modules/contact/view/admin/settings.html
View File

@@ -47,7 +47,7 @@
</label>
</div>
<div id="phpmailer" class="well well-sm clearfix collapse" style="margin: 15px 0 0 0;">
{if: !class_exists("PHPMailer")}
{if: !class_exists("PHPMailer\PHPMailer\PHPMailer")}
<div class="alert alert-danger">{$lang.contact.phpmailer_error}</div>
{/if}
<div class="form-group">