Merge pull request #199 from Marian-Kechlibar/master1.1.1

Update Auth.php

4 files changed, 9 insertions, 1 deletions

diff --git a/Auth.php b/Auth.php
index ea311df..d20a707 100644
--- a/Auth.php
+++ b/Auth.php
@@ -791,6 +791,7 @@ class Auth
         if ($sendmail === true) {
             // Check configuration for SMTP parameters
             $mail = new PHPMailer;
+			$mail->CharSet = $this->config->mail_charset;
             if ($this->config->smtp) {
                 $mail->isSMTP();
                 $mail->Host = $this->config->smtp_host;
diff --git a/Config.php b/Config.php
index ed29dca..0294d40 100644
--- a/Config.php
+++ b/Config.php
@@ -124,6 +124,11 @@ class Config
         if (!isset($this->config['emailmessage_suppress_reset'])) {
             $this->config['emailmessage_suppress_reset'] = 0;
         }
-    }
+		
+		if (!isset($this->config['mail_charset'])) {
+            $this->config['mail_charset'] = "UTF-8";
+        }
+	}
+	
 
 }
diff --git a/database_mysql.sql b/database_mysql.sql
index c38b39c..3db7ddd 100644
--- a/database_mysql.sql
+++ b/database_mysql.sql
@@ -35,6 +35,7 @@ INSERT INTO `config` (`setting`, `value`) VALUES
 ('cookie_secure', '0'),
 ('emailmessage_suppress_activation',  '0'),
 ('emailmessage_suppress_reset', '0'),
+('mail_charset','UTF-8'),
 ('password_min_score',  '3'),
 ('site_activation_page',  'activate'),
 ('site_email',  'no-reply@phpauth.cuonic.com'),
diff --git a/database_pgsql.sql b/database_pgsql.sql
index 6332fea..fcb7878 100644
--- a/database_pgsql.sql
+++ b/database_pgsql.sql
@@ -19,6 +19,7 @@ INSERT INTO config (setting, value) VALUES
 ('cookie_secure', '0'),
 ('emailmessage_suppress_activation',  '0'),
 ('emailmessage_suppress_reset', '0'),
+('mail_charset','UTF-8'),
 ('password_min_score',  '3'),
 ('site_activation_page',  'activate'),
 ('site_email',  'no-reply@phpauth.cuonic.com'),