From 1a2f789209c33bdede04e7ea7575b79c1f9063be Mon Sep 17 00:00:00 2001
From: Deltacms <contact@deltacms.fr>
Date: Sun, 1 May 2022 11:45:17 +0200
Subject: [PATCH] modifications 4105

---
 CHANGES.md                                    |   7 +-
 README.md                                     |   2 +-
 core/class/helper.class.php                   |  12 +-
 core/class/jsondb/Dot.class.php               |   9 +-
 core/class/phpmailer/Exception.class.php      |   5 +-
 core/class/phpmailer/PHPMailer.class.php      | 812 ++++++++++++------
 core/class/phpmailer/SMTP.class.php           | 235 +++--
 core/class/phpmailer/phpmailer.lang-fr.php    |  38 +
 core/class/template.class.php                 |  17 +-
 core/core.js.php                              |  21 +-
 core/core.php                                 |  67 +-
 core/include/update.inc.php                   |   4 +
 core/layout/common.css                        |   5 +
 core/layout/main.php                          |  24 +-
 core/module/config/config.php                 | 121 +--
 core/module/config/view/restore/restore.php   |  56 --
 core/module/install/ressource/defaultdata.php |   5 +-
 core/module/page/page.php                     |   2 +-
 core/module/page/view/edit/edit.js.php        |   7 +-
 core/module/user/user.php                     |   6 +-
 core/vendor/filemanager/config/config.php     |  20 +-
 module/blog/blog.php                          |  18 +-
 module/blog/view/article/article.php          |  30 +-
 module/blog/view/index/index.php              |  23 +-
 module/form/form.php                          | 225 +++--
 module/form/ressource/.htaccess               |   4 +
 module/form/view/config/config.php            |  21 +-
 module/form/view/index/index.css              |  39 +
 module/form/view/index/index.js.php           |   3 +
 module/form/view/index/index.php              |  37 +-
 module/gallery/gallery.php                    |   2 +-
 module/gallery/view/edit/edit.js.php          |   4 -
 module/statislite/include/stat.php            |   4 +-
 module/statislite/statislite.php              |  40 +-
 34 files changed, 1211 insertions(+), 714 deletions(-)
 create mode 100644 core/class/phpmailer/phpmailer.lang-fr.php
 create mode 100644 module/form/ressource/.htaccess
 create mode 100644 module/form/view/index/index.css

diff --git a/CHANGES.md b/CHANGES.md
index f5cd8a0..c2c9e63 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Version 4.1.05 de Deltacms
+- Modifications :
+	- Langues : RFM bilingue anglais / français et quelques compléments de traduction,
+	- Formulaire : avec le module Form possibilité de placer une pièce jointe dans le mail (jpg, jpeg, png ou gif)
+
 ## Version 4.1.04 de Deltacms
 - Modifications :
 	- Langues : ajout de 4 langues régionales, corse, breton, catalan, basque.
@@ -9,7 +14,7 @@
 	- Statislite : amèioration de l'affichage de la date initiale,
 	- Agenda : si la langue originale du site n'est pas reconnue, la langue d'administration est utilisée,
 	- Blog : dans les labels de Tinymce si la langue originale du site n'est pas reconnue, la langue d'administration est utilisée,
-	- Langues : si le dapeau correspondant au langage du site n'existe pas un drapeau paer défaut est affiché dans les pages de localisation.
+	- Langues : si le dapeau correspondant au langage du site n'existe pas un drapeau par défaut est affiché dans les pages de localisation.
 - Correction : 
 	- Statislite : modification de l'initialisation du filtrage primaire.
 
diff --git a/README.md b/README.md
index 6874cdc..902ac88 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 
-# DeltaCMS 4.1.04
+# DeltaCMS 4.1.05
 
 DeltaCMS est un CMS sans base de données (flat-file) qui permet de créer et gérer facilement un site web sans aucune connaissance en programmation.
 L'administration du site est bilingue anglais ou français, le site peut être rédigé dans une des principales langues européennes.
diff --git a/core/class/helper.class.php b/core/class/helper.class.php
index ad71ddc..42472ac 100644
--- a/core/class/helper.class.php
+++ b/core/class/helper.class.php
@@ -321,7 +321,11 @@ class helper {
 	 * @return string
 	 */
 	public static function filter($text, $filter) {
-		$text = trim($text);
+		if( isset($text)){
+			$text = trim( $text);
+		} else {
+			$text = '';
+		}
 		switch($filter) {
 			case self::FILTER_BOOLEAN:
 				$text = (bool) $text;
@@ -367,10 +371,12 @@ class helper {
 				$text = password_hash($text, PASSWORD_BCRYPT);
 				break;
 			case self::FILTER_STRING_LONG:
-				$text = mb_substr(filter_var($text, FILTER_SANITIZE_STRING), 0, 500000);
+				// $text = mb_substr(filter_var($text, FILTER_SANITIZE_STRING), 0, 500000);
+				$text = mb_substr( strip_tags($text) , 0, 500000);
 				break;
 			case self::FILTER_STRING_SHORT:
-				$text = mb_substr(filter_var($text, FILTER_SANITIZE_STRING), 0, 500);
+				// $text = mb_substr(filter_var($text, FILTER_SANITIZE_STRING), 0, 500);
+				$text = mb_substr( strip_tags($text) , 0, 500);
 				break;
 			case self::FILTER_TIMESTAMP:
 				$text = date('Y-m-d H:i:s', $text);
diff --git a/core/class/jsondb/Dot.class.php b/core/class/jsondb/Dot.class.php
index 3c4af64..337352c 100644
--- a/core/class/jsondb/Dot.class.php
+++ b/core/class/jsondb/Dot.class.php
@@ -12,8 +12,6 @@ use ArrayAccess;
  */
 class Dot implements ArrayAccess
 {
-
-    /** @var array Data */
     protected $data = [];
 
     /**
@@ -271,21 +269,22 @@ class Dot implements ArrayAccess
     /**
      * ArrayAccess abstract methods
      */
+	#[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
         $this->set($offset, $value);
     }
-
+	#[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         return $this->has($offset);
     }
-
+	#[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->get($offset);
     }
-
+	#[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
         $this->delete($offset);
diff --git a/core/class/phpmailer/Exception.class.php b/core/class/phpmailer/Exception.class.php
index b1e552f..52eaf95 100644
--- a/core/class/phpmailer/Exception.class.php
+++ b/core/class/phpmailer/Exception.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PHPMailer Exception class.
  * PHP Version 5.5.
@@ -9,7 +10,7 @@
  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2017 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -34,6 +35,6 @@ class Exception extends \Exception
      */
     public function errorMessage()
     {
-        return '<strong>' . htmlspecialchars($this->getMessage()) . "</strong><br />\n";
+        return '<strong>' . htmlspecialchars($this->getMessage(), ENT_COMPAT | ENT_HTML401) . "</strong><br />\n";
     }
 }
diff --git a/core/class/phpmailer/PHPMailer.class.php b/core/class/phpmailer/PHPMailer.class.php
index 51dff92..718216b 100644
--- a/core/class/phpmailer/PHPMailer.class.php
+++ b/core/class/phpmailer/PHPMailer.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PHPMailer - PHP email creation and transport class.
  * PHP Version 5.5.
@@ -9,7 +10,7 @@
  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2019 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -102,14 +103,14 @@ class PHPMailer
      *
      * @var string
      */
-    public $From = 'root@localhost';
+    public $From = '';
 
     /**
      * The From name of the message.
      *
      * @var string
      */
-    public $FromName = 'Root User';
+    public $FromName = '';
 
     /**
      * The envelope sender of the message.
@@ -357,9 +358,9 @@ class PHPMailer
     public $AuthType = '';
 
     /**
-     * An instance of the PHPMailer OAuth class.
+     * An implementation of the PHPMailer OAuthTokenProvider interface.
      *
-     * @var OAuth
+     * @var OAuthTokenProvider
      */
     protected $oauth;
 
@@ -388,11 +389,11 @@ class PHPMailer
      * SMTP class debug output mode.
      * Debug output level.
      * Options:
-     * * SMTP::DEBUG_OFF: No output
-     * * SMTP::DEBUG_CLIENT: Client messages
-     * * SMTP::DEBUG_SERVER: Client and server messages
-     * * SMTP::DEBUG_CONNECTION: As SERVER plus connection status
-     * * SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
+     * @see SMTP::DEBUG_OFF: No output
+     * @see SMTP::DEBUG_CLIENT: Client messages
+     * @see SMTP::DEBUG_SERVER: Client and server messages
+     * @see SMTP::DEBUG_CONNECTION: As SERVER plus connection status
+     * @see SMTP::DEBUG_LOWLEVEL: Noisy, low-level data output, rarely needed
      *
      * @see SMTP::$do_debug
      *
@@ -427,9 +428,11 @@ class PHPMailer
     public $Debugoutput = 'echo';
 
     /**
-     * Whether to keep SMTP connection open after each message.
-     * If this is set to true then to close the connection
-     * requires an explicit call to smtpClose().
+     * Whether to keep the SMTP connection open after each message.
+     * If this is set to true then the connection will remain open after a send,
+     * and closing the connection will require an explicit call to smtpClose().
+     * It's a good idea to use this if you are sending multiple messages as it reduces overhead.
+     * See the mailing list example for how to use it.
      *
      * @var bool
      */
@@ -441,6 +444,8 @@ class PHPMailer
      * Only supported in `mail` and `sendmail` transports, not in SMTP.
      *
      * @var bool
+     *
+     * @deprecated 6.0.0 PHPMailer isn't a mailing list manager!
      */
     public $SingleTo = false;
 
@@ -684,7 +689,7 @@ class PHPMailer
     protected $boundary = [];
 
     /**
-     * The array of available languages.
+     * The array of available text strings for the current language.
      *
      * @var array
      */
@@ -745,7 +750,7 @@ class PHPMailer
      *
      * @var string
      */
-    const VERSION = '6.1.5';
+    const VERSION = '6.6.0';
 
     /**
      * Error severity: message only, continue processing.
@@ -859,18 +864,25 @@ class PHPMailer
             $subject = $this->encodeHeader($this->secureHeader($subject));
         }
         //Calling mail() with null params breaks
+        $this->edebug('Sending with mail()');
+        $this->edebug('Sendmail path: ' . ini_get('sendmail_path'));
+        $this->edebug("Envelope sender: {$this->Sender}");
+        $this->edebug("To: {$to}");
+        $this->edebug("Subject: {$subject}");
+        $this->edebug("Headers: {$header}");
         if (!$this->UseSendmailOptions || null === $params) {
             $result = @mail($to, $subject, $body, $header);
         } else {
+            $this->edebug("Additional params: {$params}");
             $result = @mail($to, $subject, $body, $header, $params);
         }
-
+        $this->edebug('Result: ' . ($result ? 'true' : 'false'));
         return $result;
     }
 
     /**
-     * Output debugging info via user-defined method.
-     * Only generates output if SMTP debug output is enabled (@see SMTP::$do_debug).
+     * Output debugging info via a user-defined method.
+     * Only generates output if debug output is enabled.
      *
      * @see PHPMailer::$Debugoutput
      * @see PHPMailer::$SMTPDebug
@@ -897,6 +909,7 @@ class PHPMailer
         switch ($this->Debugoutput) {
             case 'error_log':
                 //Don't output, just log
+                /** @noinspection ForgottenDebugOutputInspection */
                 error_log($str);
                 break;
             case 'html':
@@ -1066,7 +1079,7 @@ class PHPMailer
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
         $pos = strrpos($address, '@');
         if (false === $pos) {
-            // At-sign is missing.
+            //At-sign is missing.
             $error_message = sprintf(
                 '%s (%s): %s',
                 $this->lang('invalid_address'),
@@ -1082,7 +1095,7 @@ class PHPMailer
             return false;
         }
         $params = [$kind, $address, $name];
-        // Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
+        //Enqueue addresses with IDN until we know the PHPMailer::$CharSet.
         if (static::idnSupported() && $this->has8bitChars(substr($address, ++$pos))) {
             if ('Reply-To' !== $kind) {
                 if (!array_key_exists($address, $this->RecipientsQueue)) {
@@ -1099,7 +1112,7 @@ class PHPMailer
             return false;
         }
 
-        // Immediately add standard addresses without IDN.
+        //Immediately add standard addresses without IDN.
         return call_user_func_array([$this, 'addAnAddress'], $params);
     }
 
@@ -1172,19 +1185,39 @@ class PHPMailer
      *
      * @param string $addrstr The address list string
      * @param bool   $useimap Whether to use the IMAP extension to parse the list
+     * @param string $charset The charset to use when decoding the address list string.
      *
      * @return array
      */
-    public static function parseAddresses($addrstr, $useimap = true)
+    public static function parseAddresses($addrstr, $useimap = true, $charset = self::CHARSET_ISO88591)
     {
         $addresses = [];
         if ($useimap && function_exists('imap_rfc822_parse_adrlist')) {
             //Use this built-in parser if it's available
             $list = imap_rfc822_parse_adrlist($addrstr, '');
+            // Clear any potential IMAP errors to get rid of notices being thrown at end of script.
+            imap_errors();
             foreach ($list as $address) {
-                if (('.SYNTAX-ERROR.' !== $address->host) && static::validateAddress(
-                    $address->mailbox . '@' . $address->host
-                )) {
+                if (
+                    '.SYNTAX-ERROR.' !== $address->host &&
+                    static::validateAddress($address->mailbox . '@' . $address->host)
+                ) {
+                    //Decode the name part if it's present and encoded
+                    if (
+                        property_exists($address, 'personal') &&
+                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
+                        defined('MB_CASE_UPPER') &&
+                        preg_match('/^=\?.*\?=$/s', $address->personal)
+                    ) {
+                        $origCharset = mb_internal_encoding();
+                        mb_internal_encoding($charset);
+                        //Undo any RFC2047-encoded spaces-as-underscores
+                        $address->personal = str_replace('_', '=20', $address->personal);
+                        //Decode the name
+                        $address->personal = mb_decode_mimeheader($address->personal);
+                        mb_internal_encoding($origCharset);
+                    }
+
                     $addresses[] = [
                         'name' => (property_exists($address, 'personal') ? $address->personal : ''),
                         'address' => $address->mailbox . '@' . $address->host,
@@ -1208,9 +1241,22 @@ class PHPMailer
                 } else {
                     list($name, $email) = explode('<', $address);
                     $email = trim(str_replace('>', '', $email));
+                    $name = trim($name);
                     if (static::validateAddress($email)) {
+                        //Check for a Mbstring constant rather than using extension_loaded, which is sometimes disabled
+                        //If this name is encoded, decode it
+                        if (defined('MB_CASE_UPPER') && preg_match('/^=\?.*\?=$/s', $name)) {
+                            $origCharset = mb_internal_encoding();
+                            mb_internal_encoding($charset);
+                            //Undo any RFC2047-encoded spaces-as-underscores
+                            $name = str_replace('_', '=20', $name);
+                            //Decode the name
+                            $name = mb_decode_mimeheader($name);
+                            mb_internal_encoding($origCharset);
+                        }
                         $addresses[] = [
-                            'name' => trim(str_replace(['"', "'"], '', $name)),
+                            //Remove any surrounding quotes and spaces from the name
+                            'name' => trim($name, '\'" '),
                             'address' => $email,
                         ];
                     }
@@ -1236,9 +1282,10 @@ class PHPMailer
     {
         $address = trim($address);
         $name = trim(preg_replace('/[\r\n]+/', '', $name)); //Strip breaks and trim
-        // Don't validate now addresses with IDN. Will be done in send().
+        //Don't validate now addresses with IDN. Will be done in send().
         $pos = strrpos($address, '@');
-        if ((false === $pos)
+        if (
+            (false === $pos)
             || ((!$this->has8bitChars(substr($address, ++$pos)) || !static::idnSupported())
             && !static::validateAddress($address))
         ) {
@@ -1306,8 +1353,9 @@ class PHPMailer
         if (null === $patternselect) {
             $patternselect = static::$validator;
         }
-        if (is_callable($patternselect)) {
-            return $patternselect($address);
+        //Don't allow strings as callables, see SECURITY.md and CVE-2021-3603
+        if (is_callable($patternselect) && !is_string($patternselect)) {
+            return call_user_func($patternselect, $address);
         }
         //Reject line breaks in addresses; it's valid RFC5322, but not RFC5321
         if (strpos($address, "\n") !== false || strpos($address, "\r") !== false) {
@@ -1348,7 +1396,7 @@ class PHPMailer
                 /*
                  * This is the pattern used in the HTML5 spec for validation of 'email' type form input elements.
                  *
-                 * @see http://www.whatwg.org/specs/web-apps/current-work/#e-mail-state-(type=email)
+                 * @see https://html.spec.whatwg.org/#e-mail-state-(type=email)
                  */
                 return (bool) preg_match(
                     '/^[a-zA-Z0-9.!#$%&\'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}' .
@@ -1388,23 +1436,33 @@ class PHPMailer
      */
     public function punyencodeAddress($address)
     {
-        // Verify we have required functions, CharSet, and at-sign.
+        //Verify we have required functions, CharSet, and at-sign.
         $pos = strrpos($address, '@');
-        if (!empty($this->CharSet) &&
+        if (
+            !empty($this->CharSet) &&
             false !== $pos &&
             static::idnSupported()
         ) {
             $domain = substr($address, ++$pos);
-            // Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
+            //Verify CharSet string is a valid one, and domain properly encoded in this CharSet.
             if ($this->has8bitChars($domain) && @mb_check_encoding($domain, $this->CharSet)) {
-                $domain = mb_convert_encoding($domain, 'UTF-8', $this->CharSet);
+                //Convert the domain from whatever charset it's in to UTF-8
+                $domain = mb_convert_encoding($domain, self::CHARSET_UTF8, $this->CharSet);
                 //Ignore IDE complaints about this line - method signature changed in PHP 5.4
                 $errorcode = 0;
                 if (defined('INTL_IDNA_VARIANT_UTS46')) {
-                    $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_UTS46);
+                    //Use the current punycode standard (appeared in PHP 7.2)
+                    $punycode = idn_to_ascii(
+                        $domain,
+                        \IDNA_DEFAULT | \IDNA_USE_STD3_RULES | \IDNA_CHECK_BIDI |
+                            \IDNA_CHECK_CONTEXTJ | \IDNA_NONTRANSITIONAL_TO_ASCII,
+                        \INTL_IDNA_VARIANT_UTS46
+                    );
                 } elseif (defined('INTL_IDNA_VARIANT_2003')) {
-                    $punycode = idn_to_ascii($domain, $errorcode, INTL_IDNA_VARIANT_2003);
+                    //Fall back to this old, deprecated/removed encoding
+                    $punycode = idn_to_ascii($domain, $errorcode, \INTL_IDNA_VARIANT_2003);
                 } else {
+                    //Fall back to a default we don't know about
                     $punycode = idn_to_ascii($domain, $errorcode);
                 }
                 if (false !== $punycode) {
@@ -1452,8 +1510,9 @@ class PHPMailer
      */
     public function preSend()
     {
-        if ('smtp' === $this->Mailer
-            || ('mail' === $this->Mailer && stripos(PHP_OS, 'WIN') === 0)
+        if (
+            'smtp' === $this->Mailer
+            || ('mail' === $this->Mailer && (\PHP_VERSION_ID >= 80000 || stripos(PHP_OS, 'WIN') === 0))
         ) {
             //SMTP mandates RFC-compliant line endings
             //and it's also used with mail() on Windows
@@ -1463,25 +1522,21 @@ class PHPMailer
             static::setLE(PHP_EOL);
         }
         //Check for buggy PHP versions that add a header with an incorrect line break
-        if ('mail' === $this->Mailer
-            && ((PHP_VERSION_ID >= 70000 && PHP_VERSION_ID < 70017)
-                || (PHP_VERSION_ID >= 70100 && PHP_VERSION_ID < 70103))
+        if (
+            'mail' === $this->Mailer
+            && ((\PHP_VERSION_ID >= 70000 && \PHP_VERSION_ID < 70017)
+                || (\PHP_VERSION_ID >= 70100 && \PHP_VERSION_ID < 70103))
             && ini_get('mail.add_x_header') === '1'
             && stripos(PHP_OS, 'WIN') === 0
         ) {
-            trigger_error(
-                'Your version of PHP is affected by a bug that may result in corrupted messages.' .
-                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
-                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
-                E_USER_WARNING
-            );
+            trigger_error($this->lang('buggy_php'), E_USER_WARNING);
         }
 
         try {
-            $this->error_count = 0; // Reset errors
+            $this->error_count = 0; //Reset errors
             $this->mailHeader = '';
 
-            // Dequeue recipient and Reply-To addresses with IDN
+            //Dequeue recipient and Reply-To addresses with IDN
             foreach (array_merge($this->RecipientsQueue, $this->ReplyToQueue) as $params) {
                 $params[1] = $this->punyencodeAddress($params[1]);
                 call_user_func_array([$this, 'addAnAddress'], $params);
@@ -1490,7 +1545,7 @@ class PHPMailer
                 throw new Exception($this->lang('provide_address'), self::STOP_CRITICAL);
             }
 
-            // Validate From, Sender, and ConfirmReadingTo addresses
+            //Validate From, Sender, and ConfirmReadingTo addresses
             foreach (['From', 'Sender', 'ConfirmReadingTo'] as $address_kind) {
                 $this->$address_kind = trim($this->$address_kind);
                 if (empty($this->$address_kind)) {
@@ -1514,29 +1569,29 @@ class PHPMailer
                 }
             }
 
-            // Set whether the message is multipart/alternative
+            //Set whether the message is multipart/alternative
             if ($this->alternativeExists()) {
                 $this->ContentType = static::CONTENT_TYPE_MULTIPART_ALTERNATIVE;
             }
 
             $this->setMessageType();
-            // Refuse to send an empty message unless we are specifically allowing it
+            //Refuse to send an empty message unless we are specifically allowing it
             if (!$this->AllowEmpty && empty($this->Body)) {
                 throw new Exception($this->lang('empty_message'), self::STOP_CRITICAL);
             }
 
             //Trim subject consistently
             $this->Subject = trim($this->Subject);
-            // Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
+            //Create body before headers in case body makes changes to headers (e.g. altering transfer encoding)
             $this->MIMEHeader = '';
             $this->MIMEBody = $this->createBody();
-            // createBody may have added some headers, so retain them
+            //createBody may have added some headers, so retain them
             $tempheaders = $this->MIMEHeader;
             $this->MIMEHeader = $this->createHeader();
             $this->MIMEHeader .= $tempheaders;
 
-            // To capture the complete message when using mail(), create
-            // an extra header list which createHeader() doesn't fold in
+            //To capture the complete message when using mail(), create
+            //an extra header list which createHeader() doesn't fold in
             if ('mail' === $this->Mailer) {
                 if (count($this->to) > 0) {
                     $this->mailHeader .= $this->addrAppend('To', $this->to);
@@ -1549,8 +1604,9 @@ class PHPMailer
                 );
             }
 
-            // Sign with DKIM if enabled
-            if (!empty($this->DKIM_domain)
+            //Sign with DKIM if enabled
+            if (
+                !empty($this->DKIM_domain)
                 && !empty($this->DKIM_selector)
                 && (!empty($this->DKIM_private_string)
                     || (!empty($this->DKIM_private)
@@ -1589,7 +1645,7 @@ class PHPMailer
     public function postSend()
     {
         try {
-            // Choose the mailer and send through it
+            //Choose the mailer and send through it
             switch ($this->Mailer) {
                 case 'sendmail':
                 case 'qmail':
@@ -1607,6 +1663,9 @@ class PHPMailer
                     return $this->mailSend($this->MIMEHeader, $this->MIMEBody);
             }
         } catch (Exception $exc) {
+            if ($this->Mailer === 'smtp' && $this->SMTPKeepAlive == true) {
+                $this->smtp->reset();
+            }
             $this->setError($exc->getMessage());
             $this->edebug($exc->getMessage());
             if ($this->exceptions) {
@@ -1631,22 +1690,47 @@ class PHPMailer
      */
     protected function sendmailSend($header, $body)
     {
+        if ($this->Mailer === 'qmail') {
+            $this->edebug('Sending with qmail');
+        } else {
+            $this->edebug('Sending with sendmail');
+        }
         $header = static::stripTrailingWSP($header) . static::$LE . static::$LE;
+        //This sets the SMTP envelope sender which gets turned into a return-path header by the receiver
+        //A space after `-f` is optional, but there is a long history of its presence
+        //causing problems, so we don't use one
+        //Exim docs: http://www.exim.org/exim-html-current/doc/html/spec_html/ch-the_exim_command_line.html
+        //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
+        //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
+        //Example problem: https://www.drupal.org/node/1057954
 
-        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
-        if (!empty($this->Sender) && self::isShellSafe($this->Sender)) {
-            if ('qmail' === $this->Mailer) {
+        //PHP 5.6 workaround
+        $sendmail_from_value = ini_get('sendmail_from');
+        if (empty($this->Sender) && !empty($sendmail_from_value)) {
+            //PHP config has a sender address we can use
+            $this->Sender = ini_get('sendmail_from');
+        }
+        //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+        if (!empty($this->Sender) && static::validateAddress($this->Sender) && self::isShellSafe($this->Sender)) {
+            if ($this->Mailer === 'qmail') {
                 $sendmailFmt = '%s -f%s';
             } else {
                 $sendmailFmt = '%s -oi -f%s -t';
             }
-        } elseif ('qmail' === $this->Mailer) {
-            $sendmailFmt = '%s';
         } else {
+            //allow sendmail to choose a default envelope sender. It may
+            //seem preferable to force it to use the From header as with
+            //SMTP, but that introduces new problems (see
+            //<https://github.com/PHPMailer/PHPMailer/issues/2298>), and
+            //it has historically worked this way.
             $sendmailFmt = '%s -oi -t';
         }
 
         $sendmail = sprintf($sendmailFmt, escapeshellcmd($this->Sendmail), $this->Sender);
+        $this->edebug('Sendmail path: ' . $this->Sendmail);
+        $this->edebug('Sendmail command: ' . $sendmail);
+        $this->edebug('Envelope sender: ' . $this->Sender);
+        $this->edebug("Headers: {$header}");
 
         if ($this->SingleTo) {
             foreach ($this->SingleToArray as $toAddr) {
@@ -1654,13 +1738,15 @@ class PHPMailer
                 if (!$mail) {
                     throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
                 }
+                $this->edebug("To: {$toAddr}");
                 fwrite($mail, 'To: ' . $toAddr . "\n");
                 fwrite($mail, $header);
                 fwrite($mail, $body);
                 $result = pclose($mail);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
                 $this->doCallback(
                     ($result === 0),
-                    [$toAddr],
+                    [[$addrinfo['address'], $addrinfo['name']]],
                     $this->cc,
                     $this->bcc,
                     $this->Subject,
@@ -1668,6 +1754,7 @@ class PHPMailer
                     $this->From,
                     []
                 );
+                $this->edebug("Result: " . ($result === 0 ? 'true' : 'false'));
                 if (0 !== $result) {
                     throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
                 }
@@ -1690,6 +1777,7 @@ class PHPMailer
                 $this->From,
                 []
             );
+            $this->edebug("Result: " . ($result === 0 ? 'true' : 'false'));
             if (0 !== $result) {
                 throw new Exception($this->lang('execute') . $this->Sendmail, self::STOP_CRITICAL);
             }
@@ -1710,8 +1798,15 @@ class PHPMailer
      */
     protected static function isShellSafe($string)
     {
-        // Future-proof
-        if (escapeshellcmd($string) !== $string
+        //It's not possible to use shell commands safely (which includes the mail() function) without escapeshellarg,
+        //but some hosting providers disable it, creating a security problem that we don't want to have to deal with,
+        //so we don't.
+        if (!function_exists('escapeshellarg') || !function_exists('escapeshellcmd')) {
+            return false;
+        }
+
+        if (
+            escapeshellcmd($string) !== $string
             || !in_array(escapeshellarg($string), ["'$string'", "\"$string\""])
         ) {
             return false;
@@ -1722,9 +1817,9 @@ class PHPMailer
         for ($i = 0; $i < $length; ++$i) {
             $c = $string[$i];
 
-            // All other characters have a special meaning in at least one common shell, including = and +.
-            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
-            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
+            //All other characters have a special meaning in at least one common shell, including = and +.
+            //Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
+            //Note that this does permit non-Latin alphanumeric characters based on the current locale.
             if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
                 return false;
             }
@@ -1744,7 +1839,28 @@ class PHPMailer
      */
     protected static function isPermittedPath($path)
     {
-        return !preg_match('#^[a-z]+://#i', $path);
+        //Matches scheme definition from https://tools.ietf.org/html/rfc3986#section-3.1
+        return !preg_match('#^[a-z][a-z\d+.-]*://#i', $path);
+    }
+
+    /**
+     * Check whether a file path is safe, accessible, and readable.
+     *
+     * @param string $path A relative or absolute path to a file
+     *
+     * @return bool
+     */
+    protected static function fileIsAccessible($path)
+    {
+        if (!static::isPermittedPath($path)) {
+            return false;
+        }
+        $readable = file_exists($path);
+        //If not a UNC path (expected to start with \\), check read permission, see #2069
+        if (strpos($path, '\\\\') !== 0) {
+            $readable = $readable && is_readable($path);
+        }
+        return  $readable;
     }
 
     /**
@@ -1777,11 +1893,18 @@ class PHPMailer
         //Sendmail docs: http://www.sendmail.org/~ca/email/man/sendmail.html
         //Qmail docs: http://www.qmail.org/man/man8/qmail-inject.html
         //Example problem: https://www.drupal.org/node/1057954
-        // CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
-        if (!empty($this->Sender) && static::validateAddress($this->Sender) && self::isShellSafe($this->Sender)) {
-            $params = sprintf('-f%s', $this->Sender);
+        //CVE-2016-10033, CVE-2016-10045: Don't pass -f if characters will be escaped.
+
+        //PHP 5.6 workaround
+        $sendmail_from_value = ini_get('sendmail_from');
+        if (empty($this->Sender) && !empty($sendmail_from_value)) {
+            //PHP config has a sender address we can use
+            $this->Sender = ini_get('sendmail_from');
         }
         if (!empty($this->Sender) && static::validateAddress($this->Sender)) {
+            if (self::isShellSafe($this->Sender)) {
+                $params = sprintf('-f%s', $this->Sender);
+            }
             $old_from = ini_get('sendmail_from');
             ini_set('sendmail_from', $this->Sender);
         }
@@ -1789,7 +1912,17 @@ class PHPMailer
         if ($this->SingleTo && count($toArr) > 1) {
             foreach ($toArr as $toAddr) {
                 $result = $this->mailPassthru($toAddr, $this->Subject, $body, $header, $params);
-                $this->doCallback($result, [$toAddr], $this->cc, $this->bcc, $this->Subject, $body, $this->From, []);
+                $addrinfo = static::parseAddresses($toAddr, true, $this->CharSet);
+                $this->doCallback(
+                    $result,
+                    [[$addrinfo['address'], $addrinfo['name']]],
+                    $this->cc,
+                    $this->bcc,
+                    $this->Subject,
+                    $body,
+                    $this->From,
+                    []
+                );
             }
         } else {
             $result = $this->mailPassthru($to, $this->Subject, $body, $header, $params);
@@ -1867,7 +2000,7 @@ class PHPMailer
         }
 
         $callbacks = [];
-        // Attempt to send to all recipients
+        //Attempt to send to all recipients
         foreach ([$this->to, $this->cc, $this->bcc] as $togroup) {
             foreach ($togroup as $to) {
                 if (!$this->smtp->recipient($to[0], $this->dsn)) {
@@ -1878,11 +2011,11 @@ class PHPMailer
                     $isSent = true;
                 }
 
-                $callbacks[] = ['issent'=>$isSent, 'to'=>$to[0]];
+                $callbacks[] = ['issent' => $isSent, 'to' => $to[0], 'name' => $to[1]];
             }
         }
 
-        // Only send the DATA command if we have viable recipients
+        //Only send the DATA command if we have viable recipients
         if ((count($this->all_recipients) > count($bad_rcpt)) && !$this->smtp->data($header . $body)) {
             throw new Exception($this->lang('data_not_accepted'), self::STOP_CRITICAL);
         }
@@ -1899,7 +2032,7 @@ class PHPMailer
         foreach ($callbacks as $cb) {
             $this->doCallback(
                 $cb['issent'],
-                [$cb['to']],
+                [[$cb['to'], $cb['name']]],
                 [],
                 [],
                 $this->Subject,
@@ -1944,7 +2077,7 @@ class PHPMailer
             $options = $this->SMTPOptions;
         }
 
-        // Already connected?
+        //Already connected?
         if ($this->smtp->connected()) {
             return true;
         }
@@ -1958,20 +2091,22 @@ class PHPMailer
 
         foreach ($hosts as $hostentry) {
             $hostinfo = [];
-            if (!preg_match(
-                '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
-                trim($hostentry),
-                $hostinfo
-            )) {
+            if (
+                !preg_match(
+                    '/^(?:(ssl|tls):\/\/)?(.+?)(?::(\d+))?$/',
+                    trim($hostentry),
+                    $hostinfo
+                )
+            ) {
                 $this->edebug($this->lang('invalid_hostentry') . ' ' . trim($hostentry));
-                // Not a valid host entry
+                //Not a valid host entry
                 continue;
             }
-            // $hostinfo[1]: optional ssl or tls prefix
-            // $hostinfo[2]: the hostname
-            // $hostinfo[3]: optional port number
-            // The host string prefix can temporarily override the current setting for SMTPSecure
-            // If it's not specified, the default value is used
+            //$hostinfo[1]: optional ssl or tls prefix
+            //$hostinfo[2]: the hostname
+            //$hostinfo[3]: optional port number
+            //The host string prefix can temporarily override the current setting for SMTPSecure
+            //If it's not specified, the default value is used
 
             //Check the host name is a valid name or IP address before trying to use it
             if (!static::isValidHost($hostinfo[2])) {
@@ -1983,11 +2118,11 @@ class PHPMailer
             $tls = (static::ENCRYPTION_STARTTLS === $this->SMTPSecure);
             if ('ssl' === $hostinfo[1] || ('' === $hostinfo[1] && static::ENCRYPTION_SMTPS === $this->SMTPSecure)) {
                 $prefix = 'ssl://';
-                $tls = false; // Can't have SSL and TLS at the same time
+                $tls = false; //Can't have SSL and TLS at the same time
                 $secure = static::ENCRYPTION_SMTPS;
             } elseif ('tls' === $hostinfo[1]) {
                 $tls = true;
-                // tls doesn't use a prefix
+                //TLS doesn't use a prefix
                 $secure = static::ENCRYPTION_STARTTLS;
             }
             //Do we need the OpenSSL extension?
@@ -2000,7 +2135,12 @@ class PHPMailer
             }
             $host = $hostinfo[2];
             $port = $this->Port;
-            if (array_key_exists(3, $hostinfo) && is_numeric($hostinfo[3]) && $hostinfo[3] > 0 && $hostinfo[3] < 65536) {
+            if (
+                array_key_exists(3, $hostinfo) &&
+                is_numeric($hostinfo[3]) &&
+                $hostinfo[3] > 0 &&
+                $hostinfo[3] < 65536
+            ) {
                 $port = (int) $hostinfo[3];
             }
             if ($this->smtp->connect($prefix . $host, $port, $this->Timeout, $options)) {
@@ -2012,26 +2152,29 @@ class PHPMailer
                     }
                     $this->smtp->hello($hello);
                     //Automatically enable TLS encryption if:
-                    // * it's not disabled
-                    // * we have openssl extension
-                    // * we are not already using SSL
-                    // * the server offers STARTTLS
+                    //* it's not disabled
+                    //* we have openssl extension
+                    //* we are not already using SSL
+                    //* the server offers STARTTLS
                     if ($this->SMTPAutoTLS && $sslext && 'ssl' !== $secure && $this->smtp->getServerExt('STARTTLS')) {
                         $tls = true;
                     }
                     if ($tls) {
                         if (!$this->smtp->startTLS()) {
-                            throw new Exception($this->lang('connect_host'));
+                            $message = $this->getSmtpErrorMessage('connect_host');
+                            throw new Exception($message);
                         }
-                        // We must resend EHLO after TLS negotiation
+                        //We must resend EHLO after TLS negotiation
                         $this->smtp->hello($hello);
                     }
-                    if ($this->SMTPAuth && !$this->smtp->authenticate(
-                        $this->Username,
-                        $this->Password,
-                        $this->AuthType,
-                        $this->oauth
-                    )) {
+                    if (
+                        $this->SMTPAuth && !$this->smtp->authenticate(
+                            $this->Username,
+                            $this->Password,
+                            $this->AuthType,
+                            $this->oauth
+                        )
+                    ) {
                         throw new Exception($this->lang('authenticate'));
                     }
 
@@ -2039,16 +2182,20 @@ class PHPMailer
                 } catch (Exception $exc) {
                     $lastexception = $exc;
                     $this->edebug($exc->getMessage());
-                    // We must have connected, but then failed TLS or Auth, so close connection nicely
+                    //We must have connected, but then failed TLS or Auth, so close connection nicely
                     $this->smtp->quit();
                 }
             }
         }
-        // If we get here, all connection attempts have failed, so close connection hard
+        //If we get here, all connection attempts have failed, so close connection hard
         $this->smtp->close();
-        // As we've caught all exceptions, just report whatever the last one was
+        //As we've caught all exceptions, just report whatever the last one was
         if ($this->exceptions && null !== $lastexception) {
             throw $lastexception;
+        } elseif ($this->exceptions) {
+            // no exception was thrown, likely $this->smtp->connect() failed
+            $message = $this->getSmtpErrorMessage('connect_host');
+            throw new Exception($message);
         }
 
         return false;
@@ -2067,17 +2214,19 @@ class PHPMailer
 
     /**
      * Set the language for error messages.
-     * Returns false if it cannot load the language file.
      * The default language is English.
      *
      * @param string $langcode  ISO 639-1 2-character language code (e.g. French is "fr")
+     *                          Optionally, the language code can be enhanced with a 4-character
+     *                          script annotation and/or a 2-character country annotation.
      * @param string $lang_path Path to the language file directory, with trailing separator (slash)
+     *                          Do not set this from user input!
      *
-     * @return bool
+     * @return bool Returns true if the requested language was loaded, false otherwise.
      */
     public function setLanguage($langcode = 'en', $lang_path = '')
     {
-        // Backwards compatibility for renamed language codes
+        //Backwards compatibility for renamed language codes
         $renamed_langcodes = [
             'br' => 'pt_br',
             'cz' => 'cs',
@@ -2089,58 +2238,109 @@ class PHPMailer
             'am' => 'hy',
         ];
 
-        if (isset($renamed_langcodes[$langcode])) {
+        if (array_key_exists($langcode, $renamed_langcodes)) {
             $langcode = $renamed_langcodes[$langcode];
         }
 
-        // Define full set of translatable strings in English
+        //Define full set of translatable strings in English
         $PHPMAILER_LANG = [
             'authenticate' => 'SMTP Error: Could not authenticate.',
+            'buggy_php' => 'Your version of PHP is affected by a bug that may result in corrupted messages.' .
+                ' To fix it, switch to sending using SMTP, disable the mail.add_x_header option in' .
+                ' your php.ini, switch to MacOS or Linux, or upgrade your PHP to version 7.0.17+ or 7.1.3+.',
             'connect_host' => 'SMTP Error: Could not connect to SMTP host.',
             'data_not_accepted' => 'SMTP Error: data not accepted.',
             'empty_message' => 'Message body empty',
             'encoding' => 'Unknown encoding: ',
             'execute' => 'Could not execute: ',
+            'extension_missing' => 'Extension missing: ',
             'file_access' => 'Could not access file: ',
             'file_open' => 'File Error: Could not open file: ',
             'from_failed' => 'The following From address failed: ',
             'instantiate' => 'Could not instantiate mail function.',
             'invalid_address' => 'Invalid address: ',
+            'invalid_header' => 'Invalid header name or value',
             'invalid_hostentry' => 'Invalid hostentry: ',
             'invalid_host' => 'Invalid host: ',
             'mailer_not_supported' => ' mailer is not supported.',
             'provide_address' => 'You must provide at least one recipient email address.',
             'recipients_failed' => 'SMTP Error: The following recipients failed: ',
             'signing' => 'Signing Error: ',
+            'smtp_code' => 'SMTP code: ',
+            'smtp_code_ex' => 'Additional SMTP info: ',
             'smtp_connect_failed' => 'SMTP connect() failed.',
+            'smtp_detail' => 'Detail: ',
             'smtp_error' => 'SMTP server error: ',
             'variable_set' => 'Cannot set or reset variable: ',
-            'extension_missing' => 'Extension missing: ',
         ];
         if (empty($lang_path)) {
-            // Calculate an absolute path so it can work if CWD is not here
+            //Calculate an absolute path so it can work if CWD is not here
             $lang_path = dirname(__DIR__) . DIRECTORY_SEPARATOR . 'language' . DIRECTORY_SEPARATOR;
         }
+
         //Validate $langcode
-        if (!preg_match('/^[a-z]{2}(?:_[a-zA-Z]{2})?$/', $langcode)) {
+        $foundlang = true;
+        $langcode  = strtolower($langcode);
+        if (
+            !preg_match('/^(?P<lang>[a-z]{2})(?P<script>_[a-z]{4})?(?P<country>_[a-z]{2})?$/', $langcode, $matches)
+            && $langcode !== 'en'
+        ) {
+            $foundlang = false;
             $langcode = 'en';
         }
-        $foundlang = true;
-        $lang_file = $lang_path . 'phpmailer.lang-' . $langcode . '.php';
-        // There is no English translation file
+
+        //There is no English translation file
         if ('en' !== $langcode) {
-            // Make sure language file path is readable
-            if (!static::isPermittedPath($lang_file) || !file_exists($lang_file)) {
+            $langcodes = [];
+            if (!empty($matches['script']) && !empty($matches['country'])) {
+                $langcodes[] = $matches['lang'] . $matches['script'] . $matches['country'];
+            }
+            if (!empty($matches['country'])) {
+                $langcodes[] = $matches['lang'] . $matches['country'];
+            }
+            if (!empty($matches['script'])) {
+                $langcodes[] = $matches['lang'] . $matches['script'];
+            }
+            $langcodes[] = $matches['lang'];
+
+            //Try and find a readable language file for the requested language.
+            $foundFile = false;
+            foreach ($langcodes as $code) {
+                $lang_file = $lang_path . 'phpmailer.lang-' . $code . '.php';
+                if (static::fileIsAccessible($lang_file)) {
+                    $foundFile = true;
+                    break;
+                }
+            }
+
+            if ($foundFile === false) {
                 $foundlang = false;
             } else {
-                // Overwrite language-specific strings.
-                // This way we'll never have missing translation keys.
-                $foundlang = include $lang_file;
+                $lines = file($lang_file);
+                foreach ($lines as $line) {
+                    //Translation file lines look like this:
+                    //$PHPMAILER_LANG['authenticate'] = 'SMTP-Fehler: Authentifizierung fehlgeschlagen.';
+                    //These files are parsed as text and not PHP so as to avoid the possibility of code injection
+                    //See https://blog.stevenlevithan.com/archives/match-quoted-string
+                    $matches = [];
+                    if (
+                        preg_match(
+                            '/^\$PHPMAILER_LANG\[\'([a-z\d_]+)\'\]\s*=\s*(["\'])(.+)*?\2;/',
+                            $line,
+                            $matches
+                        ) &&
+                        //Ignore unknown translation keys
+                        array_key_exists($matches[1], $PHPMAILER_LANG)
+                    ) {
+                        //Overwrite language-specific strings so we'll never have missing translation keys.
+                        $PHPMAILER_LANG[$matches[1]] = (string)$matches[3];
+                    }
+                }
             }
         }
         $this->language = $PHPMAILER_LANG;
 
-        return (bool) $foundlang; // Returns false if language not found
+        return $foundlang; //Returns false if language not found
     }
 
     /**
@@ -2150,6 +2350,10 @@ class PHPMailer
      */
     public function getTranslations()
     {
+        if (empty($this->language)) {
+            $this->setLanguage(); // Set the default language.
+        }
+
         return $this->language;
     }
 
@@ -2184,7 +2388,7 @@ class PHPMailer
      */
     public function addrFormat($addr)
     {
-        if (empty($addr[1])) { // No name provided
+        if (empty($addr[1])) { //No name provided
             return $this->secureHeader($addr[0]);
         }
 
@@ -2211,8 +2415,8 @@ class PHPMailer
         } else {
             $soft_break = static::$LE;
         }
-        // If utf-8 encoding is used, we will need to make sure we don't
-        // split multibyte characters when we wrap
+        //If utf-8 encoding is used, we will need to make sure we don't
+        //split multibyte characters when we wrap
         $is_utf8 = static::CHARSET_UTF8 === strtolower($this->CharSet);
         $lelen = strlen(static::$LE);
         $crlflen = strlen(static::$LE);
@@ -2312,29 +2516,29 @@ class PHPMailer
             $lastChunk = substr($encodedText, $maxLength - $lookBack, $lookBack);
             $encodedCharPos = strpos($lastChunk, '=');
             if (false !== $encodedCharPos) {
-                // Found start of encoded character byte within $lookBack block.
-                // Check the encoded byte value (the 2 chars after the '=')
+                //Found start of encoded character byte within $lookBack block.
+                //Check the encoded byte value (the 2 chars after the '=')
                 $hex = substr($encodedText, $maxLength - $lookBack + $encodedCharPos + 1, 2);
                 $dec = hexdec($hex);
                 if ($dec < 128) {
-                    // Single byte character.
-                    // If the encoded char was found at pos 0, it will fit
-                    // otherwise reduce maxLength to start of the encoded char
+                    //Single byte character.
+                    //If the encoded char was found at pos 0, it will fit
+                    //otherwise reduce maxLength to start of the encoded char
                     if ($encodedCharPos > 0) {
                         $maxLength -= $lookBack - $encodedCharPos;
                     }
                     $foundSplitPos = true;
                 } elseif ($dec >= 192) {
-                    // First byte of a multi byte character
-                    // Reduce maxLength to split at start of character
+                    //First byte of a multi byte character
+                    //Reduce maxLength to split at start of character
                     $maxLength -= $lookBack - $encodedCharPos;
                     $foundSplitPos = true;
                 } elseif ($dec < 192) {
-                    // Middle byte of a multi byte character, look further back
+                    //Middle byte of a multi byte character, look further back
                     $lookBack += 3;
                 }
             } else {
-                // No encoded character found
+                //No encoded character found
                 $foundSplitPos = true;
             }
         }
@@ -2378,30 +2582,28 @@ class PHPMailer
 
         $result .= $this->headerLine('Date', '' === $this->MessageDate ? self::rfcDate() : $this->MessageDate);
 
-        // To be created automatically by mail()
-        if ($this->SingleTo) {
-            if ('mail' !== $this->Mailer) {
+        //The To header is created automatically by mail(), so needs to be omitted here
+        if ('mail' !== $this->Mailer) {
+            if ($this->SingleTo) {
                 foreach ($this->to as $toaddr) {
                     $this->SingleToArray[] = $this->addrFormat($toaddr);
                 }
-            }
-        } elseif (count($this->to) > 0) {
-            if ('mail' !== $this->Mailer) {
+            } elseif (count($this->to) > 0) {
                 $result .= $this->addrAppend('To', $this->to);
+            } elseif (count($this->cc) === 0) {
+                $result .= $this->headerLine('To', 'undisclosed-recipients:;');
             }
-        } elseif (count($this->cc) === 0) {
-            $result .= $this->headerLine('To', 'undisclosed-recipients:;');
         }
-
         $result .= $this->addrAppend('From', [[trim($this->From), $this->FromName]]);
 
-        // sendmail and mail() extract Cc from the header before sending
+        //sendmail and mail() extract Cc from the header before sending
         if (count($this->cc) > 0) {
             $result .= $this->addrAppend('Cc', $this->cc);
         }
 
-        // sendmail and mail() extract Bcc from the header before sending
-        if ((
+        //sendmail and mail() extract Bcc from the header before sending
+        if (
+            (
                 'sendmail' === $this->Mailer || 'qmail' === $this->Mailer || 'mail' === $this->Mailer
             )
             && count($this->bcc) > 0
@@ -2413,14 +2615,24 @@ class PHPMailer
             $result .= $this->addrAppend('Reply-To', $this->ReplyTo);
         }
 
-        // mail() sets the subject itself
+        //mail() sets the subject itself
         if ('mail' !== $this->Mailer) {
             $result .= $this->headerLine('Subject', $this->encodeHeader($this->secureHeader($this->Subject)));
         }
 
-        // Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
-        // https://tools.ietf.org/html/rfc5322#section-3.6.4
-        if ('' !== $this->MessageID && preg_match('/^<.*@.*>$/', $this->MessageID)) {
+        //Only allow a custom message ID if it conforms to RFC 5322 section 3.6.4
+        //https://tools.ietf.org/html/rfc5322#section-3.6.4
+        if (
+            '' !== $this->MessageID &&
+            preg_match(
+                '/^<((([a-z\d!#$%&\'*+\/=?^_`{|}~-]+(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)' .
+                '|("(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]|[\x21\x23-\x5B\x5D-\x7E])' .
+                '|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*"))@(([a-z\d!#$%&\'*+\/=?^_`{|}~-]+' .
+                '(\.[a-z\d!#$%&\'*+\/=?^_`{|}~-]+)*)|(\[(([\x01-\x08\x0B\x0C\x0E-\x1F\x7F]' .
+                '|[\x21-\x5A\x5E-\x7E])|(\\[\x01-\x09\x0B\x0C\x0E-\x7F]))*\])))>$/Di',
+                $this->MessageID
+            )
+        ) {
             $this->lastMessageID = $this->MessageID;
         } else {
             $this->lastMessageID = sprintf('<%s@%s>', $this->uniqueid, $this->serverHostname());
@@ -2430,22 +2642,21 @@ class PHPMailer
             $result .= $this->headerLine('X-Priority', $this->Priority);
         }
         if ('' === $this->XMailer) {
+            //Empty string for default X-Mailer header
             $result .= $this->headerLine(
                 'X-Mailer',
                 'PHPMailer ' . self::VERSION . ' (https://github.com/PHPMailer/PHPMailer)'
             );
-        } else {
-            $myXmailer = trim($this->XMailer);
-            if ($myXmailer) {
-                $result .= $this->headerLine('X-Mailer', $myXmailer);
-            }
-        }
+        } elseif (is_string($this->XMailer) && trim($this->XMailer) !== '') {
+            //Some string
+            $result .= $this->headerLine('X-Mailer', trim($this->XMailer));
+        } //Other values result in no X-Mailer header
 
         if ('' !== $this->ConfirmReadingTo) {
             $result .= $this->headerLine('Disposition-Notification-To', '<' . $this->ConfirmReadingTo . '>');
         }
 
-        // Add custom headers
+        //Add custom headers
         foreach ($this->CustomHeader as $header) {
             $result .= $this->headerLine(
                 trim($header[0]),
@@ -2487,28 +2698,24 @@ class PHPMailer
                 $result .= $this->textLine(' boundary="' . $this->boundary[1] . '"');
                 break;
             default:
-                // Catches case 'plain': and case '':
+                //Catches case 'plain': and case '':
                 $result .= $this->textLine('Content-Type: ' . $this->ContentType . '; charset=' . $this->CharSet);
                 $ismultipart = false;
                 break;
         }
-        // RFC1341 part 5 says 7bit is assumed if not specified
+        //RFC1341 part 5 says 7bit is assumed if not specified
         if (static::ENCODING_7BIT !== $this->Encoding) {
-            // RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
+            //RFC 2045 section 6.4 says multipart MIME parts may only use 7bit, 8bit or binary CTE
             if ($ismultipart) {
                 if (static::ENCODING_8BIT === $this->Encoding) {
                     $result .= $this->headerLine('Content-Transfer-Encoding', static::ENCODING_8BIT);
                 }
-                // The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
+                //The only remaining alternatives are quoted-printable and base64, which are both 7bit compatible
             } else {
                 $result .= $this->headerLine('Content-Transfer-Encoding', $this->Encoding);
             }
         }
 
-        if ('mail' !== $this->Mailer) {
-//            $result .= static::$LE;
-        }
-
         return $result;
     }
 
@@ -2607,7 +2814,7 @@ class PHPMailer
             $altBodyEncoding = static::ENCODING_QUOTED_PRINTABLE;
         }
         //Use this as a preamble in all multipart message types
-        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE  . static::$LE;
+        $mimepre = 'This is a multi-part message in MIME format.' . static::$LE . static::$LE;
         switch ($this->message_type) {
             case 'inline':
                 $body .= $mimepre;
@@ -2777,7 +2984,7 @@ class PHPMailer
                 $body .= $this->attachAll('attachment', $this->boundary[1]);
                 break;
             default:
-                // Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
+                //Catch case 'plain' and case '', applies to simple `text/plain` and `text/html` body content types
                 //Reset the `Encoding` property in case we changed it for line length reasons
                 $this->Encoding = $bodyEncoding;
                 $body .= $this->encodeString($this->Body, $this->Encoding);
@@ -2868,7 +3075,7 @@ class PHPMailer
         $result .= $this->textLine('--' . $boundary);
         $result .= sprintf('Content-Type: %s; charset=%s', $contentType, $charSet);
         $result .= static::$LE;
-        // RFC1341 part 5 says 7bit is assumed if not specified
+        //RFC1341 part 5 says 7bit is assumed if not specified
         if (static::ENCODING_7BIT !== $encoding) {
             $result .= $this->headerLine('Content-Transfer-Encoding', $encoding);
         }
@@ -2947,7 +3154,7 @@ class PHPMailer
      * @param string $path        Path to the attachment
      * @param string $name        Overrides the attachment name
      * @param string $encoding    File encoding (see $Encoding)
-     * @param string $type        File extension (MIME) type
+     * @param string $type        MIME type, e.g. `image/jpeg`; determined automatically from $path if not specified
      * @param string $disposition Disposition to use
      *
      * @throws Exception
@@ -2962,11 +3169,11 @@ class PHPMailer
         $disposition = 'attachment'
     ) {
         try {
-            if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) {
+            if (!static::fileIsAccessible($path)) {
                 throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
             }
 
-            // If a MIME type is not specified, try to work it out from the file name
+            //If a MIME type is not specified, try to work it out from the file name
             if ('' === $type) {
                 $type = static::filenameToType($path);
             }
@@ -2975,7 +3182,6 @@ class PHPMailer
             if ('' === $name) {
                 $name = $filename;
             }
-
             if (!$this->validateEncoding($encoding)) {
                 throw new Exception($this->lang('encoding') . $encoding);
             }
@@ -2986,7 +3192,7 @@ class PHPMailer
                 2 => $name,
                 3 => $encoding,
                 4 => $type,
-                5 => false, // isStringAttachment
+                5 => false, //isStringAttachment
                 6 => $disposition,
                 7 => $name,
             ];
@@ -3026,16 +3232,16 @@ class PHPMailer
      */
     protected function attachAll($disposition_type, $boundary)
     {
-        // Return text of body
+        //Return text of body
         $mime = [];
         $cidUniq = [];
         $incl = [];
 
-        // Add all attachments
+        //Add all attachments
         foreach ($this->attachment as $attachment) {
-            // Check if it is a valid disposition_filter
+            //Check if it is a valid disposition_filter
             if ($attachment[6] === $disposition_type) {
-                // Check for string attachment
+                //Check for string attachment
                 $string = '';
                 $path = '';
                 $bString = $attachment[5];
@@ -3064,9 +3270,9 @@ class PHPMailer
                 //Only include a filename property if we have one
                 if (!empty($name)) {
                     $mime[] = sprintf(
-                        'Content-Type: %s; name="%s"%s',
+                        'Content-Type: %s; name=%s%s',
                         $type,
-                        $this->encodeHeader($this->secureHeader($name)),
+                        static::quotedString($this->encodeHeader($this->secureHeader($name))),
                         static::$LE
                     );
                 } else {
@@ -3076,7 +3282,7 @@ class PHPMailer
                         static::$LE
                     );
                 }
-                // RFC1341 part 5 says 7bit is assumed if not specified
+                //RFC1341 part 5 says 7bit is assumed if not specified
                 if (static::ENCODING_7BIT !== $encoding) {
                     $mime[] = sprintf('Content-Transfer-Encoding: %s%s', $encoding, static::$LE);
                 }
@@ -3086,24 +3292,14 @@ class PHPMailer
                     $mime[] = 'Content-ID: <' . $this->encodeHeader($this->secureHeader($cid)) . '>' . static::$LE;
                 }
 
-                // If a filename contains any of these chars, it should be quoted,
-                // but not otherwise: RFC2183 & RFC2045 5.1
-                // Fixes a warning in IETF's msglint MIME checker
-                // Allow for bypassing the Content-Disposition header totally
+                //Allow for bypassing the Content-Disposition header
                 if (!empty($disposition)) {
                     $encoded_name = $this->encodeHeader($this->secureHeader($name));
-                    if (preg_match('/[ ()<>@,;:"\/\[\]?=]/', $encoded_name)) {
-                        $mime[] = sprintf(
-                            'Content-Disposition: %s; filename="%s"%s',
-                            $disposition,
-                            $encoded_name,
-                            static::$LE . static::$LE
-                        );
-                    } elseif (!empty($encoded_name)) {
+                    if (!empty($encoded_name)) {
                         $mime[] = sprintf(
                             'Content-Disposition: %s; filename=%s%s',
                             $disposition,
-                            $encoded_name,
+                            static::quotedString($encoded_name),
                             static::$LE . static::$LE
                         );
                     } else {
@@ -3117,7 +3313,7 @@ class PHPMailer
                     $mime[] = static::$LE;
                 }
 
-                // Encode as string attachment
+                //Encode as string attachment
                 if ($bString) {
                     $mime[] = $this->encodeString($string, $encoding);
                 } else {
@@ -3147,7 +3343,7 @@ class PHPMailer
     protected function encodeFile($path, $encoding = self::ENCODING_BASE64)
     {
         try {
-            if (!static::isPermittedPath($path) || !file_exists($path) || !is_readable($path)) {
+            if (!static::fileIsAccessible($path)) {
                 throw new Exception($this->lang('file_open') . $path, self::STOP_CONTINUE);
             }
             $file_buffer = file_get_contents($path);
@@ -3163,6 +3359,7 @@ class PHPMailer
             if ($this->exceptions) {
                 throw $exc;
             }
+
             return '';
         }
     }
@@ -3192,7 +3389,7 @@ class PHPMailer
             case static::ENCODING_7BIT:
             case static::ENCODING_8BIT:
                 $encoded = static::normalizeBreaks($str);
-                // Make sure it ends with a line break
+                //Make sure it ends with a line break
                 if (substr($encoded, -(strlen(static::$LE))) !== static::$LE) {
                     $encoded .= static::$LE;
                 }
@@ -3230,7 +3427,7 @@ class PHPMailer
         switch (strtolower($position)) {
             case 'phrase':
                 if (!preg_match('/[\200-\377]/', $str)) {
-                    // Can't use addslashes as we don't know the value of magic_quotes_sybase
+                    //Can't use addslashes as we don't know the value of magic_quotes_sybase
                     $encoded = addcslashes($str, "\0..\37\177\\\"");
                     if (($str === $encoded) && !preg_match('/[^A-Za-z0-9!#$%&\'*+\/=?^_`{|}~ -]/', $str)) {
                         return $encoded;
@@ -3256,7 +3453,7 @@ class PHPMailer
             $charset = static::CHARSET_ASCII;
         }
 
-        // Q/B encoding adds 8 chars and the charset ("` =?<charset>?[QB]?<content>?=`").
+        //Q/B encoding adds 8 chars and the charset ("` =?<charset>?[QB]?<content>?=`").
         $overhead = 8 + strlen($charset);
 
         if ('mail' === $this->Mailer) {
@@ -3265,26 +3462,26 @@ class PHPMailer
             $maxlen = static::MAX_LINE_LENGTH - $overhead;
         }
 
-        // Select the encoding that produces the shortest output and/or prevents corruption.
+        //Select the encoding that produces the shortest output and/or prevents corruption.
         if ($matchcount > strlen($str) / 3) {
-            // More than 1/3 of the content needs encoding, use B-encode.
+            //More than 1/3 of the content needs encoding, use B-encode.
             $encoding = 'B';
         } elseif ($matchcount > 0) {
-            // Less than 1/3 of the content needs encoding, use Q-encode.
+            //Less than 1/3 of the content needs encoding, use Q-encode.
             $encoding = 'Q';
         } elseif (strlen($str) > $maxlen) {
-            // No encoding needed, but value exceeds max line length, use Q-encode to prevent corruption.
+            //No encoding needed, but value exceeds max line length, use Q-encode to prevent corruption.
             $encoding = 'Q';
         } else {
-            // No reformatting needed
+            //No reformatting needed
             $encoding = false;
         }
 
         switch ($encoding) {
             case 'B':
                 if ($this->hasMultiBytes($str)) {
-                    // Use a custom function which correctly encodes and wraps long
-                    // multibyte strings without breaking lines within a character
+                    //Use a custom function which correctly encodes and wraps long
+                    //multibyte strings without breaking lines within a character
                     $encoded = $this->base64EncodeWrapMB($str, "\n");
                 } else {
                     $encoded = base64_encode($str);
@@ -3319,7 +3516,7 @@ class PHPMailer
             return strlen($str) > mb_strlen($str, $this->CharSet);
         }
 
-        // Assume no multibytes (we can't handle without mbstring functions anyway)
+        //Assume no multibytes (we can't handle without mbstring functions anyway)
         return false;
     }
 
@@ -3357,11 +3554,11 @@ class PHPMailer
         }
 
         $mb_length = mb_strlen($str, $this->CharSet);
-        // Each line must have length <= 75, including $start and $end
+        //Each line must have length <= 75, including $start and $end
         $length = 75 - strlen($start) - strlen($end);
-        // Average multi-byte ratio
+        //Average multi-byte ratio
         $ratio = $mb_length / strlen($str);
-        // Base64 has a 4:3 ratio
+        //Base64 has a 4:3 ratio
         $avgLength = floor($length * $ratio * .75);
 
         $offset = 0;
@@ -3376,7 +3573,7 @@ class PHPMailer
             $encoded .= $chunk . $linebreak;
         }
 
-        // Chomp the last linefeed
+        //Chomp the last linefeed
         return substr($encoded, 0, -strlen($linebreak));
     }
 
@@ -3405,12 +3602,12 @@ class PHPMailer
      */
     public function encodeQ($str, $position = 'text')
     {
-        // There should not be any EOL in the string
+        //There should not be any EOL in the string
         $pattern = '';
         $encoded = str_replace(["\r", "\n"], '', $str);
         switch (strtolower($position)) {
             case 'phrase':
-                // RFC 2047 section 5.3
+                //RFC 2047 section 5.3
                 $pattern = '^A-Za-z0-9!*+\/ -';
                 break;
             /*
@@ -3423,15 +3620,15 @@ class PHPMailer
             /* Intentional fall through */
             case 'text':
             default:
-                // RFC 2047 section 5.1
-                // Replace every high ascii, control, =, ? and _ characters
+                //RFC 2047 section 5.1
+                //Replace every high ascii, control, =, ? and _ characters
                 $pattern = '\000-\011\013\014\016-\037\075\077\137\177-\377' . $pattern;
                 break;
         }
         $matches = [];
         if (preg_match_all("/[{$pattern}]/", $encoded, $matches)) {
-            // If the string contains an '=', make sure it's the first thing we replace
-            // so as to avoid double-encoding
+            //If the string contains an '=', make sure it's the first thing we replace
+            //so as to avoid double-encoding
             $eqkey = array_search('=', $matches[0], true);
             if (false !== $eqkey) {
                 unset($matches[0][$eqkey]);
@@ -3441,8 +3638,8 @@ class PHPMailer
                 $encoded = str_replace($char, '=' . sprintf('%02X', ord($char)), $encoded);
             }
         }
-        // Replace spaces with _ (more readable than =20)
-        // RFC 2047 section 4.2(2)
+        //Replace spaces with _ (more readable than =20)
+        //RFC 2047 section 4.2(2)
         return str_replace(' ', '_', $encoded);
     }
 
@@ -3469,7 +3666,7 @@ class PHPMailer
         $disposition = 'attachment'
     ) {
         try {
-            // If a MIME type is not specified, try to work it out from the file name
+            //If a MIME type is not specified, try to work it out from the file name
             if ('' === $type) {
                 $type = static::filenameToType($filename);
             }
@@ -3478,14 +3675,14 @@ class PHPMailer
                 throw new Exception($this->lang('encoding') . $encoding);
             }
 
-            // Append to $attachment array
+            //Append to $attachment array
             $this->attachment[] = [
                 0 => $string,
                 1 => $filename,
                 2 => static::mb_pathinfo($filename, PATHINFO_BASENAME),
                 3 => $encoding,
                 4 => $type,
-                5 => true, // isStringAttachment
+                5 => true, //isStringAttachment
                 6 => $disposition,
                 7 => 0,
             ];
@@ -3532,11 +3729,11 @@ class PHPMailer
         $disposition = 'inline'
     ) {
         try {
-            if (!static::isPermittedPath($path) || !@is_file($path) || !is_readable($path)) {
+            if (!static::fileIsAccessible($path)) {
                 throw new Exception($this->lang('file_access') . $path, self::STOP_CONTINUE);
             }
 
-            // If a MIME type is not specified, try to work it out from the file name
+            //If a MIME type is not specified, try to work it out from the file name
             if ('' === $type) {
                 $type = static::filenameToType($path);
             }
@@ -3550,14 +3747,14 @@ class PHPMailer
                 $name = $filename;
             }
 
-            // Append to $attachment array
+            //Append to $attachment array
             $this->attachment[] = [
                 0 => $path,
                 1 => $filename,
                 2 => $name,
                 3 => $encoding,
                 4 => $type,
-                5 => false, // isStringAttachment
+                5 => false, //isStringAttachment
                 6 => $disposition,
                 7 => $cid,
             ];
@@ -3602,7 +3799,7 @@ class PHPMailer
         $disposition = 'inline'
     ) {
         try {
-            // If a MIME type is not specified, try to work it out from the name
+            //If a MIME type is not specified, try to work it out from the name
             if ('' === $type && !empty($name)) {
                 $type = static::filenameToType($name);
             }
@@ -3611,14 +3808,14 @@ class PHPMailer
                 throw new Exception($this->lang('encoding') . $encoding);
             }
 
-            // Append to $attachment array
+            //Append to $attachment array
             $this->attachment[] = [
                 0 => $string,
                 1 => $name,
                 2 => $name,
                 3 => $encoding,
                 4 => $type,
-                5 => true, // isStringAttachment
+                5 => true, //isStringAttachment
                 6 => $disposition,
                 7 => $cid,
             ];
@@ -3818,13 +4015,13 @@ class PHPMailer
             if (!empty($lasterror['error'])) {
                 $msg .= $this->lang('smtp_error') . $lasterror['error'];
                 if (!empty($lasterror['detail'])) {
-                    $msg .= ' Detail: ' . $lasterror['detail'];
+                    $msg .= ' ' . $this->lang('smtp_detail') . $lasterror['detail'];
                 }
                 if (!empty($lasterror['smtp_code'])) {
-                    $msg .= ' SMTP code: ' . $lasterror['smtp_code'];
+                    $msg .= ' ' . $this->lang('smtp_code') . $lasterror['smtp_code'];
                 }
                 if (!empty($lasterror['smtp_code_ex'])) {
-                    $msg .= ' Additional SMTP info: ' . $lasterror['smtp_code_ex'];
+                    $msg .= ' ' . $this->lang('smtp_code_ex') . $lasterror['smtp_code_ex'];
                 }
             }
         }
@@ -3838,8 +4035,8 @@ class PHPMailer
      */
     public static function rfcDate()
     {
-        // Set the time zone to whatever the default is to avoid 500 errors
-        // Will default to UTC if it's not set properly in php.ini
+        //Set the time zone to whatever the default is to avoid 500 errors
+        //Will default to UTC if it's not set properly in php.ini
         date_default_timezone_set(@date_default_timezone_get());
 
         return date('D, j M Y H:i:s O');
@@ -3881,10 +4078,11 @@ class PHPMailer
     public static function isValidHost($host)
     {
         //Simple syntax limits
-        if (empty($host)
+        if (
+            empty($host)
             || !is_string($host)
             || strlen($host) > 256
-            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+])$/', $host)
+            || !preg_match('/^([a-zA-Z\d.-]*|\[[a-fA-F\d:]+\])$/', $host)
         ) {
             return false;
         }
@@ -3916,13 +4114,13 @@ class PHPMailer
     protected function lang($key)
     {
         if (count($this->language) < 1) {
-            $this->setLanguage(); // set the default language
+            $this->setLanguage(); //Set the default language
         }
 
         if (array_key_exists($key, $this->language)) {
             if ('smtp_connect_failed' === $key) {
-                //Include a link to troubleshooting docs on SMTP connection failure
-                //this is by far the biggest cause of support questions
+                //Include a link to troubleshooting docs on SMTP connection failure.
+                //This is by far the biggest cause of support questions
                 //but it's usually not PHPMailer's fault.
                 return $this->language[$key] . ' https://github.com/PHPMailer/PHPMailer/wiki/Troubleshooting';
             }
@@ -3934,6 +4132,26 @@ class PHPMailer
         return $key;
     }
 
+    /**
+     * Build an error message starting with a generic one and adding details if possible.
+     *
+     * @param string $base_key
+     * @return string
+     */
+    private function getSmtpErrorMessage($base_key)
+    {
+        $message = $this->lang($base_key);
+        $error = $this->smtp->getError();
+        if (!empty($error['error'])) {
+            $message .= ' ' . $error['error'];
+            if (!empty($error['detail'])) {
+                $message .= ' ' . $error['detail'];
+            }
+        }
+
+        return $message;
+    }
+
     /**
      * Check if an error occurred.
      *
@@ -3957,15 +4175,15 @@ class PHPMailer
     public function addCustomHeader($name, $value = null)
     {
         if (null === $value && strpos($name, ':') !== false) {
-            // Value passed in as name:value
+            //Value passed in as name:value
             list($name, $value) = explode(':', $name, 2);
         }
         $name = trim($name);
-        $value = trim($value);
+        $value = (null === $value) ? '' : trim($value);
         //Ensure name is not empty, and that neither name nor value contain line breaks
         if (empty($name) || strpbrk($name . $value, "\r\n") !== false) {
             if ($this->exceptions) {
-                throw new Exception('Invalid header name or value');
+                throw new Exception($this->lang('invalid_header'));
             }
 
             return false;
@@ -3999,7 +4217,8 @@ class PHPMailer
      * @param string        $message  HTML message string
      * @param string        $basedir  Absolute path to a base directory to prepend to relative paths to images
      * @param bool|callable $advanced Whether to use the internal HTML to text converter
-     *                                or your own custom converter @return string $message The transformed message Body
+     *                                or your own custom converter
+     * @return string The transformed message body
      *
      * @throws Exception
      *
@@ -4010,11 +4229,11 @@ class PHPMailer
         preg_match_all('/(?<!-)(src|background)=["\'](.*)["\']/Ui', $message, $images);
         if (array_key_exists(2, $images)) {
             if (strlen($basedir) > 1 && '/' !== substr($basedir, -1)) {
-                // Ensure $basedir has a trailing /
+                //Ensure $basedir has a trailing /
                 $basedir .= '/';
             }
             foreach ($images[2] as $imgindex => $url) {
-                // Convert data URIs into embedded images
+                //Convert data URIs into embedded images
                 //e.g. "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
                 $match = [];
                 if (preg_match('#^data:(image/(?:jpe?g|gif|png));?(base64)?,(.+)#', $url, $match)) {
@@ -4028,7 +4247,7 @@ class PHPMailer
                     }
                     //Hash the decoded data, not the URL, so that the same data-URI image used in multiple places
                     //will only be embedded once, even if it used a different encoding
-                    $cid = substr(hash('sha256', $data), 0, 32) . '@phpmailer.0'; // RFC2392 S 2
+                    $cid = substr(hash('sha256', $data), 0, 32) . '@phpmailer.0'; //RFC2392 S 2
 
                     if (!$this->cidExists($cid)) {
                         $this->addStringEmbeddedImage(
@@ -4046,13 +4265,14 @@ class PHPMailer
                     );
                     continue;
                 }
-                if (// Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
+                if (
+                    //Only process relative URLs if a basedir is provided (i.e. no absolute local paths)
                     !empty($basedir)
-                    // Ignore URLs containing parent dir traversal (..)
+                    //Ignore URLs containing parent dir traversal (..)
                     && (strpos($url, '..') === false)
-                    // Do not change urls that are already inline images
+                    //Do not change urls that are already inline images
                     && 0 !== strpos($url, 'cid:')
-                    // Do not change absolute URLs, including anonymous protocol
+                    //Do not change absolute URLs, including anonymous protocol
                     && !preg_match('#^[a-z][a-z0-9+.-]*:?//#i', $url)
                 ) {
                     $filename = static::mb_pathinfo($url, PATHINFO_BASENAME);
@@ -4060,7 +4280,7 @@ class PHPMailer
                     if ('.' === $directory) {
                         $directory = '';
                     }
-                    // RFC2392 S 2
+                    //RFC2392 S 2
                     $cid = substr(hash('sha256', $url), 0, 32) . '@phpmailer.0';
                     if (strlen($basedir) > 1 && '/' !== substr($basedir, -1)) {
                         $basedir .= '/';
@@ -4068,13 +4288,14 @@ class PHPMailer
                     if (strlen($directory) > 1 && '/' !== substr($directory, -1)) {
                         $directory .= '/';
                     }
-                    if ($this->addEmbeddedImage(
-                        $basedir . $directory . $filename,
-                        $cid,
-                        $filename,
-                        static::ENCODING_BASE64,
-                        static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
-                    )
+                    if (
+                        $this->addEmbeddedImage(
+                            $basedir . $directory . $filename,
+                            $cid,
+                            $filename,
+                            static::ENCODING_BASE64,
+                            static::_mime_types((string) static::mb_pathinfo($filename, PATHINFO_EXTENSION))
+                        )
                     ) {
                         $message = preg_replace(
                             '/' . $images[1][$imgindex] . '=["\']' . preg_quote($url, '/') . '["\']/Ui',
@@ -4086,7 +4307,7 @@ class PHPMailer
             }
         }
         $this->isHTML();
-        // Convert all message body line breaks to LE, makes quoted-printable encoding work much better
+        //Convert all message body line breaks to LE, makes quoted-printable encoding work much better
         $this->Body = static::normalizeBreaks($message);
         $this->AltBody = static::normalizeBreaks($this->html2text($message, $advanced));
         if (!$this->alternativeExists()) {
@@ -4105,9 +4326,9 @@ class PHPMailer
      * Example usage:
      *
      * ```php
-     * // Use default conversion
+     * //Use default conversion
      * $plain = $mail->html2text($html);
-     * // Use your own custom converter
+     * //Use your own custom converter
      * $plain = $mail->html2text($html, function($html) {
      *     $converter = new MyHtml2text($html);
      *     return $converter->get_text();
@@ -4116,14 +4337,15 @@ class PHPMailer
      *
      * @param string        $html     The HTML text to convert
      * @param bool|callable $advanced Any boolean value to use the internal converter,
-     *                                or provide your own callable for custom conversion
+     *                                or provide your own callable for custom conversion.
+     *                                *Never* pass user-supplied data into this parameter
      *
      * @return string
      */
     public function html2text($html, $advanced = false)
     {
         if (is_callable($advanced)) {
-            return $advanced($html);
+            return call_user_func($advanced, $html);
         }
 
         return html_entity_decode(
@@ -4222,6 +4444,7 @@ class PHPMailer
             'tiff' => 'image/tiff',
             'tif' => 'image/tiff',
             'webp' => 'image/webp',
+            'avif' => 'image/avif',
             'heif' => 'image/heif',
             'heifs' => 'image/heif-sequence',
             'heic' => 'image/heic',
@@ -4273,7 +4496,7 @@ class PHPMailer
      */
     public static function filenameToType($filename)
     {
-        // In case the path is a URL, strip any query string before getting extension
+        //In case the path is a URL, strip any query string before getting extension
         $qpos = strpos($filename, '?');
         if (false !== $qpos) {
             $filename = substr($filename, 0, $qpos);
@@ -4384,9 +4607,9 @@ class PHPMailer
         if (null === $breaktype) {
             $breaktype = static::$LE;
         }
-        // Normalise to \n
+        //Normalise to \n
         $text = str_replace([self::CRLF, "\r"], "\n", $text);
-        // Now convert LE as needed
+        //Now convert LE as needed
         if ("\n" !== $breaktype) {
             $text = str_replace("\n", $breaktype, $text);
         }
@@ -4492,11 +4715,15 @@ class PHPMailer
             $privKey = openssl_pkey_get_private($privKeyStr);
         }
         if (openssl_sign($signHeader, $signature, $privKey, 'sha256WithRSAEncryption')) {
-            openssl_pkey_free($privKey);
+            if (\PHP_MAJOR_VERSION < 8) {
+                openssl_pkey_free($privKey);
+            }
 
             return base64_encode($signature);
         }
-        openssl_pkey_free($privKey);
+        if (\PHP_MAJOR_VERSION < 8) {
+            openssl_pkey_free($privKey);
+        }
 
         return '';
     }
@@ -4561,7 +4788,7 @@ class PHPMailer
         if (empty($body)) {
             return self::CRLF;
         }
-        // Normalize line endings to CRLF
+        //Normalize line endings to CRLF
         $body = static::normalizeBreaks($body, self::CRLF);
 
         //Reduce multiple trailing line breaks to a single one
@@ -4581,9 +4808,9 @@ class PHPMailer
      */
     public function DKIM_Add($headers_line, $subject, $body)
     {
-        $DKIMsignatureType = 'rsa-sha256'; // Signature & hash algorithms
-        $DKIMcanonicalization = 'relaxed/simple'; // Canonicalization methods of header & body
-        $DKIMquery = 'dns/txt'; // Query method
+        $DKIMsignatureType = 'rsa-sha256'; //Signature & hash algorithms
+        $DKIMcanonicalization = 'relaxed/simple'; //Canonicalization methods of header & body
+        $DKIMquery = 'dns/txt'; //Query method
         $DKIMtime = time();
         //Always sign these headers without being asked
         //Recommended list from https://tools.ietf.org/html/rfc6376#section-5.4.1
@@ -4684,7 +4911,8 @@ class PHPMailer
         $headerKeys = ' h=' . implode(':', $headersToSignKeys) . ';' . static::$LE;
         $headerValues = implode(static::$LE, $headersToSign);
         $body = $this->DKIM_BodyC($body);
-        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body))); // Base64 of packed binary SHA-256 hash of body
+        //Base64 of packed binary SHA-256 hash of body
+        $DKIMb64 = base64_encode(pack('H*', hash('sha256', $body)));
         $ident = '';
         if ('' !== $this->DKIM_identity) {
             $ident = ' i=' . $this->DKIM_identity . ';' . static::$LE;
@@ -4727,6 +4955,28 @@ class PHPMailer
         return (bool) preg_match('/^(.{' . (self::MAX_LINE_LENGTH + strlen(static::$LE)) . ',})/m', $str);
     }
 
+    /**
+     * If a string contains any "special" characters, double-quote the name,
+     * and escape any double quotes with a backslash.
+     *
+     * @param string $str
+     *
+     * @return string
+     *
+     * @see RFC822 3.4.1
+     */
+    public static function quotedString($str)
+    {
+        if (preg_match('/[ ()<>@,;:"\/\[\]?=]/', $str)) {
+            //If the string contains any of these chars, it must be double-quoted
+            //and any double quotes must be escaped with a backslash
+            return '"' . str_replace('"', '\\"', $str) . '"';
+        }
+
+        //Return the string untouched, it doesn't need quoting
+        return $str;
+    }
+
     /**
      * Allows for public read access to 'to' property.
      * Before the send() call, queued addresses (i.e. with IDN) are not yet included.
@@ -4802,9 +5052,9 @@ class PHPMailer
     }
 
     /**
-     * Get the OAuth instance.
+     * Get the OAuthTokenProvider instance.
      *
-     * @return OAuth
+     * @return OAuthTokenProvider
      */
     public function getOAuth()
     {
@@ -4812,9 +5062,9 @@ class PHPMailer
     }
 
     /**
-     * Set an OAuth instance.
+     * Set an OAuthTokenProvider instance.
      */
-    public function setOAuth(OAuth $oauth)
+    public function setOAuth(OAuthTokenProvider $oauth)
     {
         $this->oauth = $oauth;
     }
diff --git a/core/class/phpmailer/SMTP.class.php b/core/class/phpmailer/SMTP.class.php
index bc08b27..5ecad21 100644
--- a/core/class/phpmailer/SMTP.class.php
+++ b/core/class/phpmailer/SMTP.class.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * PHPMailer RFC821 SMTP email transport class.
  * PHP Version 5.5.
@@ -9,7 +10,7 @@
  * @author    Jim Jagielski (jimjag) <jimjag@gmail.com>
  * @author    Andy Prevost (codeworxtech) <codeworxtech@users.sourceforge.net>
  * @author    Brent R. Matzelle (original founder)
- * @copyright 2012 - 2019 Marcus Bointon
+ * @copyright 2012 - 2020 Marcus Bointon
  * @copyright 2010 - 2012 Jim Jagielski
  * @copyright 2004 - 2009 Andy Prevost
  * @license   http://www.gnu.org/copyleft/lesser.html GNU Lesser General Public License
@@ -34,7 +35,7 @@ class SMTP
      *
      * @var string
      */
-    const VERSION = '6.1.5';
+    const VERSION = '6.6.0';
 
     /**
      * SMTP line break constant.
@@ -185,6 +186,8 @@ class SMTP
         'Amazon_SES' => '/[\d]{3} Ok (.*)/',
         'SendGrid' => '/[\d]{3} Ok: queued as (.*)/',
         'CampaignMonitor' => '/[\d]{3} 2.0.0 OK:([a-zA-Z\d]{48})/',
+        'Haraka' => '/[\d]{3} Message Queued \((.*)\)/',
+        'Mailjet' => '/[\d]{3} OK queued as (.*)/',
     ];
 
     /**
@@ -311,17 +314,11 @@ class SMTP
      */
     public function connect($host, $port = null, $timeout = 30, $options = [])
     {
-        static $streamok;
-        //This is enabled by default since 5.0.0 but some providers disable it
-        //Check this once and cache the result
-        if (null === $streamok) {
-            $streamok = function_exists('stream_socket_client');
-        }
-        // Clear errors to avoid confusion
+        //Clear errors to avoid confusion
         $this->setError('');
-        // Make sure we are __not__ connected
+        //Make sure we are __not__ connected
         if ($this->connected()) {
-            // Already connected, generate error
+            //Already connected, generate error
             $this->setError('Already connected to a server');
 
             return false;
@@ -329,18 +326,66 @@ class SMTP
         if (empty($port)) {
             $port = self::DEFAULT_PORT;
         }
-        // Connect to the SMTP server
+        //Connect to the SMTP server
         $this->edebug(
             "Connection: opening to $host:$port, timeout=$timeout, options=" .
             (count($options) > 0 ? var_export($options, true) : 'array()'),
             self::DEBUG_CONNECTION
         );
+
+        $this->smtp_conn = $this->getSMTPConnection($host, $port, $timeout, $options);
+
+        if ($this->smtp_conn === false) {
+            //Error info already set inside `getSMTPConnection()`
+            return false;
+        }
+
+        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
+
+        //Get any announcement
+        $this->last_reply = $this->get_lines();
+        $this->edebug('SERVER -> CLIENT: ' . $this->last_reply, self::DEBUG_SERVER);
+        $responseCode = (int)substr($this->last_reply, 0, 3);
+        if ($responseCode === 220) {
+            return true;
+        }
+        //Anything other than a 220 response means something went wrong
+        //RFC 5321 says the server will wait for us to send a QUIT in response to a 554 error
+        //https://tools.ietf.org/html/rfc5321#section-3.1
+        if ($responseCode === 554) {
+            $this->quit();
+        }
+        //This will handle 421 responses which may not wait for a QUIT (e.g. if the server is being shut down)
+        $this->edebug('Connection: closing due to error', self::DEBUG_CONNECTION);
+        $this->close();
+        return false;
+    }
+
+    /**
+     * Create connection to the SMTP server.
+     *
+     * @param string $host    SMTP server IP or host name
+     * @param int    $port    The port number to connect to
+     * @param int    $timeout How long to wait for the connection to open
+     * @param array  $options An array of options for stream_context_create()
+     *
+     * @return false|resource
+     */
+    protected function getSMTPConnection($host, $port = null, $timeout = 30, $options = [])
+    {
+        static $streamok;
+        //This is enabled by default since 5.0.0 but some providers disable it
+        //Check this once and cache the result
+        if (null === $streamok) {
+            $streamok = function_exists('stream_socket_client');
+        }
+
         $errno = 0;
         $errstr = '';
         if ($streamok) {
             $socket_context = stream_context_create($options);
             set_error_handler([$this, 'errorHandler']);
-            $this->smtp_conn = stream_socket_client(
+            $connection = stream_socket_client(
                 $host . ':' . $port,
                 $errno,
                 $errstr,
@@ -348,7 +393,6 @@ class SMTP
                 STREAM_CLIENT_CONNECT,
                 $socket_context
             );
-            restore_error_handler();
         } else {
             //Fall back to fsockopen which should work in more places, but is missing some features
             $this->edebug(
@@ -356,17 +400,18 @@ class SMTP
                 self::DEBUG_CONNECTION
             );
             set_error_handler([$this, 'errorHandler']);
-            $this->smtp_conn = fsockopen(
+            $connection = fsockopen(
                 $host,
                 $port,
                 $errno,
                 $errstr,
                 $timeout
             );
-            restore_error_handler();
         }
-        // Verify we connected properly
-        if (!is_resource($this->smtp_conn)) {
+        restore_error_handler();
+
+        //Verify we connected properly
+        if (!is_resource($connection)) {
             $this->setError(
                 'Failed to connect to server',
                 '',
@@ -381,22 +426,19 @@ class SMTP
 
             return false;
         }
-        $this->edebug('Connection: opened', self::DEBUG_CONNECTION);
-        // SMTP server can take longer to respond, give longer timeout for first read
-        // Windows does not have support for this timeout function
+
+        //SMTP server can take longer to respond, give longer timeout for first read
+        //Windows does not have support for this timeout function
         if (strpos(PHP_OS, 'WIN') !== 0) {
-            $max = (int) ini_get('max_execution_time');
-            // Don't bother if unlimited
-            if (0 !== $max && $timeout > $max) {
+            $max = (int)ini_get('max_execution_time');
+            //Don't bother if unlimited, or if set_time_limit is disabled
+            if (0 !== $max && $timeout > $max && strpos(ini_get('disable_functions'), 'set_time_limit') === false) {
                 @set_time_limit($timeout);
             }
-            stream_set_timeout($this->smtp_conn, $timeout, 0);
+            stream_set_timeout($connection, $timeout, 0);
         }
-        // Get any announcement
-        $announce = $this->get_lines();
-        $this->edebug('SERVER -> CLIENT: ' . $announce, self::DEBUG_SERVER);
 
-        return true;
+        return $connection;
     }
 
     /**
@@ -420,7 +462,7 @@ class SMTP
             $crypto_method |= STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT;
         }
 
-        // Begin encrypted connection
+        //Begin encrypted connection
         set_error_handler([$this, 'errorHandler']);
         $crypto_ok = stream_socket_enable_crypto(
             $this->smtp_conn,
@@ -441,7 +483,7 @@ class SMTP
      * @param string $username The user name
      * @param string $password The password
      * @param string $authtype The auth type (CRAM-MD5, PLAIN, LOGIN, XOAUTH2)
-     * @param OAuth  $OAuth    An optional OAuth instance for XOAUTH2 authentication
+     * @param OAuthTokenProvider $OAuth An optional OAuthTokenProvider instance for XOAUTH2 authentication
      *
      * @return bool True if successfully authenticated
      */
@@ -458,11 +500,11 @@ class SMTP
         }
 
         if (array_key_exists('EHLO', $this->server_caps)) {
-            // SMTP extensions are available; try to find a proper authentication method
+            //SMTP extensions are available; try to find a proper authentication method
             if (!array_key_exists('AUTH', $this->server_caps)) {
                 $this->setError('Authentication is not allowed at this stage');
-                // 'at this stage' means that auth may be allowed after the stage changes
-                // e.g. after STARTTLS
+                //'at this stage' means that auth may be allowed after the stage changes
+                //e.g. after STARTTLS
 
                 return false;
             }
@@ -506,22 +548,25 @@ class SMTP
         }
         switch ($authtype) {
             case 'PLAIN':
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH PLAIN', 334)) {
                     return false;
                 }
-                // Send encoded username and password
-                if (!$this->sendCommand(
-                    'User & Password',
-                    base64_encode("\0" . $username . "\0" . $password),
-                    235
-                )
+                //Send encoded username and password
+                if (
+                    //Format from https://tools.ietf.org/html/rfc4616#section-2
+                    //We skip the first field (it's forgery), so the string starts with a null byte
+                    !$this->sendCommand(
+                        'User & Password',
+                        base64_encode("\0" . $username . "\0" . $password),
+                        235
+                    )
                 ) {
                     return false;
                 }
                 break;
             case 'LOGIN':
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH LOGIN', 334)) {
                     return false;
                 }
@@ -533,17 +578,17 @@ class SMTP
                 }
                 break;
             case 'CRAM-MD5':
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH CRAM-MD5', 'AUTH CRAM-MD5', 334)) {
                     return false;
                 }
-                // Get the challenge
+                //Get the challenge
                 $challenge = base64_decode(substr($this->last_reply, 4));
 
-                // Build the response
+                //Build the response
                 $response = $username . ' ' . $this->hmac($challenge, $password);
 
-                // send encoded credentials
+                //send encoded credentials
                 return $this->sendCommand('Username', base64_encode($response), 235);
             case 'XOAUTH2':
                 //The OAuth instance must be set up prior to requesting auth.
@@ -552,7 +597,7 @@ class SMTP
                 }
                 $oauth = $OAuth->getOauth64();
 
-                // Start authentication
+                //Start authentication
                 if (!$this->sendCommand('AUTH', 'AUTH XOAUTH2 ' . $oauth, 235)) {
                     return false;
                 }
@@ -582,15 +627,15 @@ class SMTP
             return hash_hmac('md5', $data, $key);
         }
 
-        // The following borrowed from
-        // http://php.net/manual/en/function.mhash.php#27225
+        //The following borrowed from
+        //http://php.net/manual/en/function.mhash.php#27225
 
-        // RFC 2104 HMAC implementation for php.
-        // Creates an md5 HMAC.
-        // Eliminates the need to install mhash to compute a HMAC
-        // by Lance Rushing
+        //RFC 2104 HMAC implementation for php.
+        //Creates an md5 HMAC.
+        //Eliminates the need to install mhash to compute a HMAC
+        //by Lance Rushing
 
-        $bytelen = 64; // byte length for md5
+        $bytelen = 64; //byte length for md5
         if (strlen($key) > $bytelen) {
             $key = pack('H*', md5($key));
         }
@@ -613,7 +658,7 @@ class SMTP
         if (is_resource($this->smtp_conn)) {
             $sock_status = stream_get_meta_data($this->smtp_conn);
             if ($sock_status['eof']) {
-                // The socket is valid but we are not connected
+                //The socket is valid but we are not connected
                 $this->edebug(
                     'SMTP NOTICE: EOF caught while checking if connected',
                     self::DEBUG_CLIENT
@@ -623,7 +668,7 @@ class SMTP
                 return false;
             }
 
-            return true; // everything looks good
+            return true; //everything looks good
         }
 
         return false;
@@ -641,7 +686,7 @@ class SMTP
         $this->server_caps = null;
         $this->helo_rply = null;
         if (is_resource($this->smtp_conn)) {
-            // close the connection and cleanup
+            //Close the connection and cleanup
             fclose($this->smtp_conn);
             $this->smtp_conn = null; //Makes for cleaner serialization
             $this->edebug('Connection: closed', self::DEBUG_CONNECTION);
@@ -651,7 +696,7 @@ class SMTP
     /**
      * Send an SMTP DATA command.
      * Issues a data command and sends the msg_data to the server,
-     * finializing the mail transaction. $msg_data is the message
+     * finalizing the mail transaction. $msg_data is the message
      * that is to be send with the headers. Each header needs to be
      * on a single line followed by a <CRLF> with the message headers
      * and the message body being separated by an additional <CRLF>.
@@ -676,7 +721,7 @@ class SMTP
          * NOTE: this does not count towards line-length limit.
          */
 
-        // Normalize line breaks before exploding
+        //Normalize line breaks before exploding
         $lines = explode("\n", str_replace(["\r\n", "\r"], "\n", $msg_data));
 
         /* To distinguish between a complete RFC822 message and a plain message body, we check if the first field
@@ -722,7 +767,8 @@ class SMTP
 
             //Send the lines to the server
             foreach ($lines_out as $line_out) {
-                //RFC2821 section 4.5.2
+                //Dot-stuffing as per RFC5321 section 4.5.2
+                //https://tools.ietf.org/html/rfc5321#section-4.5.2
                 if (!empty($line_out) && $line_out[0] === '.') {
                     $line_out = '.' . $line_out;
                 }
@@ -756,7 +802,16 @@ class SMTP
     public function hello($host = '')
     {
         //Try extended hello first (RFC 2821)
-        return $this->sendHello('EHLO', $host) or $this->sendHello('HELO', $host);
+        if ($this->sendHello('EHLO', $host)) {
+            return true;
+        }
+
+        //Some servers shut down the SMTP service here (RFC 5321)
+        if (substr($this->helo_rply, 0, 3) == '421') {
+            return false;
+        }
+
+        return $this->sendHello('HELO', $host);
     }
 
     /**
@@ -946,12 +1001,12 @@ class SMTP
         $this->client_send($commandstring . static::LE, $command);
 
         $this->last_reply = $this->get_lines();
-        // Fetch SMTP code and possible error code explanation
+        //Fetch SMTP code and possible error code explanation
         $matches = [];
         if (preg_match('/^([\d]{3})[ -](?:([\d]\\.[\d]\\.[\d]{1,2}) )?/', $this->last_reply, $matches)) {
             $code = (int) $matches[1];
             $code_ex = (count($matches) > 2 ? $matches[2] : null);
-            // Cut off error code from each response line
+            //Cut off error code from each response line
             $detail = preg_replace(
                 "/{$code}[ -]" .
                 ($code_ex ? str_replace('.', '\\.', $code_ex) . ' ' : '') . '/m',
@@ -959,7 +1014,7 @@ class SMTP
                 $this->last_reply
             );
         } else {
-            // Fall back to simple parsing if regex fails
+            //Fall back to simple parsing if regex fails
             $code = (int) substr($this->last_reply, 0, 3);
             $code_ex = null;
             $detail = substr($this->last_reply, 4);
@@ -1058,8 +1113,10 @@ class SMTP
     {
         //If SMTP transcripts are left enabled, or debug output is posted online
         //it can leak credentials, so hide credentials in all but lowest level
-        if (self::DEBUG_LOWLEVEL > $this->do_debug &&
-            in_array($command, ['User & Password', 'Username', 'Password'], true)) {
+        if (
+            self::DEBUG_LOWLEVEL > $this->do_debug &&
+            in_array($command, ['User & Password', 'Username', 'Password'], true)
+        ) {
             $this->edebug('CLIENT -> SERVER: [credentials hidden]', self::DEBUG_CLIENT);
         } else {
             $this->edebug('CLIENT -> SERVER: ' . $data, self::DEBUG_CLIENT);
@@ -1113,7 +1170,7 @@ class SMTP
         if (!$this->server_caps) {
             $this->setError('No HELO/EHLO was sent');
 
-            return;
+            return null;
         }
 
         if (!array_key_exists($name, $this->server_caps)) {
@@ -1125,7 +1182,7 @@ class SMTP
             }
             $this->setError('HELO handshake was used; No information about server extensions available');
 
-            return;
+            return null;
         }
 
         return $this->server_caps[$name];
@@ -1152,7 +1209,7 @@ class SMTP
      */
     protected function get_lines()
     {
-        // If the connection is bad, give up straight away
+        //If the connection is bad, give up straight away
         if (!is_resource($this->smtp_conn)) {
             return '';
         }
@@ -1166,24 +1223,52 @@ class SMTP
         $selW = null;
         while (is_resource($this->smtp_conn) && !feof($this->smtp_conn)) {
             //Must pass vars in here as params are by reference
-            if (!stream_select($selR, $selW, $selW, $this->Timelimit)) {
+            //solution for signals inspired by https://github.com/symfony/symfony/pull/6540
+            set_error_handler([$this, 'errorHandler']);
+            $n = stream_select($selR, $selW, $selW, $this->Timelimit);
+            restore_error_handler();
+
+            if ($n === false) {
+                $message = $this->getError()['detail'];
+
+                $this->edebug(
+                    'SMTP -> get_lines(): select failed (' . $message . ')',
+                    self::DEBUG_LOWLEVEL
+                );
+
+                //stream_select returns false when the `select` system call is interrupted
+                //by an incoming signal, try the select again
+                if (stripos($message, 'interrupted system call') !== false) {
+                    $this->edebug(
+                        'SMTP -> get_lines(): retrying stream_select',
+                        self::DEBUG_LOWLEVEL
+                    );
+                    $this->setError('');
+                    continue;
+                }
+
+                break;
+            }
+
+            if (!$n) {
                 $this->edebug(
                     'SMTP -> get_lines(): select timed-out in (' . $this->Timelimit . ' sec)',
                     self::DEBUG_LOWLEVEL
                 );
                 break;
             }
+
             //Deliberate noise suppression - errors are handled afterwards
             $str = @fgets($this->smtp_conn, self::MAX_REPLY_LENGTH);
             $this->edebug('SMTP INBOUND: "' . trim($str) . '"', self::DEBUG_LOWLEVEL);
             $data .= $str;
-            // If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
-            // or 4th character is a space or a line break char, we are done reading, break the loop.
-            // String array access is a significant micro-optimisation over strlen
+            //If response is only 3 chars (not valid, but RFC5321 S4.2 says it must be handled),
+            //or 4th character is a space or a line break char, we are done reading, break the loop.
+            //String array access is a significant micro-optimisation over strlen
             if (!isset($str[3]) || $str[3] === ' ' || $str[3] === "\r" || $str[3] === "\n") {
                 break;
             }
-            // Timed-out? Log and break
+            //Timed-out? Log and break
             $info = stream_get_meta_data($this->smtp_conn);
             if ($info['timed_out']) {
                 $this->edebug(
@@ -1192,7 +1277,7 @@ class SMTP
                 );
                 break;
             }
-            // Now check if reads took too long
+            //Now check if reads took too long
             if ($endtime && time() > $endtime) {
                 $this->edebug(
                     'SMTP -> get_lines(): timelimit reached (' .
diff --git a/core/class/phpmailer/phpmailer.lang-fr.php b/core/class/phpmailer/phpmailer.lang-fr.php
new file mode 100644
index 0000000..38a7a8e
--- /dev/null
+++ b/core/class/phpmailer/phpmailer.lang-fr.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * French PHPMailer language file: refer to English translation for definitive list
+ * @package PHPMailer
+ * Some French punctuation requires a thin non-breaking space (U+202F) character before it,
+ * for example before a colon or exclamation mark.
+ * There is one of these characters between these quotes: " "
+ * @see http://unicode.org/udhr/n/notes_fra.html
+ */
+
+$PHPMAILER_LANG['authenticate']         = 'Erreur SMTP : échec de l’authentification.';
+$PHPMAILER_LANG['buggy_php']            = 'Votre version de PHP est affectée par un bug qui peut entraîner des messages corrompus. Pour résoudre ce problème, passez à l’envoi par SMTP, désactivez l’option mail.add_x_header dans le fichier php.ini, passez à MacOS ou Linux, ou passez PHP à la version 7.0.17+ ou 7.1.3+.';
+$PHPMAILER_LANG['connect_host']         = 'Erreur SMTP : impossible de se connecter au serveur SMTP.';
+$PHPMAILER_LANG['data_not_accepted']    = 'Erreur SMTP : données incorrectes.';
+$PHPMAILER_LANG['empty_message']        = 'Corps du message vide.';
+$PHPMAILER_LANG['encoding']             = 'Encodage inconnu : ';
+$PHPMAILER_LANG['execute']              = 'Impossible de lancer l’exécution : ';
+$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';
+$PHPMAILER_LANG['file_access']          = 'Impossible d’accéder au fichier : ';
+$PHPMAILER_LANG['file_open']            = 'Ouverture du fichier impossible : ';
+$PHPMAILER_LANG['from_failed']          = 'L’adresse d’expéditeur suivante a échoué : ';
+$PHPMAILER_LANG['instantiate']          = 'Impossible d’instancier la fonction mail.';
+$PHPMAILER_LANG['invalid_address']      = 'Adresse courriel non valide : ';
+$PHPMAILER_LANG['invalid_header']       = 'Nom ou valeur de l’en-tête non valide';
+$PHPMAILER_LANG['invalid_hostentry']    = 'Entrée d’hôte non valide : ';
+$PHPMAILER_LANG['invalid_host']         = 'Hôte non valide : ';
+$PHPMAILER_LANG['mailer_not_supported'] = ' client de messagerie non supporté.';
+$PHPMAILER_LANG['provide_address']      = 'Vous devez fournir au moins une adresse de destinataire.';
+$PHPMAILER_LANG['recipients_failed']    = 'Erreur SMTP : les destinataires suivants ont échoué : ';
+$PHPMAILER_LANG['signing']              = 'Erreur de signature : ';
+$PHPMAILER_LANG['smtp_code']            = 'Code SMTP : ';
+$PHPMAILER_LANG['smtp_code_ex']         = 'Informations supplémentaires SMTP : ';
+$PHPMAILER_LANG['smtp_connect_failed']  = 'La fonction SMTP connect() a échouée.';
+$PHPMAILER_LANG['smtp_detail']          = 'Détails : ';
+$PHPMAILER_LANG['smtp_error']           = 'Erreur du serveur SMTP : ';
+$PHPMAILER_LANG['variable_set']         = 'Impossible d’initialiser ou de réinitialiser une variable : ';
+$PHPMAILER_LANG['extension_missing']    = 'Extension manquante : ';
diff --git a/core/class/template.class.php b/core/class/template.class.php
index 3d2cfb0..a337340 100644
--- a/core/class/template.class.php
+++ b/core/class/template.class.php
@@ -349,7 +349,7 @@ class template {
         // Retourne le html
         return $html;
     }
-
+	
     /**
     * Ferme un formulaire
     * @return string
@@ -374,6 +374,21 @@ class template {
         return $html;
     }
 
+	/**
+    * Ouvre un formulaire avec pièce jointe protégé par CSRF
+    * @param string $id Id du formulaire
+    * @return string
+    */
+    public static function formOpenFile($id) {
+        // Ouverture formulaire
+        $html = '<form id="' . $id . '" enctype="multipart/form-data" method="post">';
+        // Stock le token CSRF
+        $html .= self::hidden('csrf', [
+            'value' => $_SESSION['csrf']
+        ]);
+        // Retourne le html
+        return $html;
+    }
 
 
     /**
diff --git a/core/core.js.php b/core/core.js.php
index 6de9e7a..f76b421 100644
--- a/core/core.js.php
+++ b/core/core.js.php
@@ -227,8 +227,7 @@ core.start = function() {
 		var samesite = "samesite=lax";
 		var getUrl   = window.location;
 		var domain   = "domain=" + getUrl.host;
-		var path     = "path=" + getUrl.pathname.split('/')[1];
-		var samesite = "samesite=lax";
+		// var path     = "path=" + getUrl.pathname.split('/')[1];
 		var e = new Date();
 		e.setFullYear(e.getFullYear() + 1);
 		var expires = "expires=" + e.toUTCString();
@@ -240,15 +239,18 @@ core.start = function() {
 			// Traitement du retour de la checkbox
 			if ($("#cookiesExt").is(":checked")) {
 				// L'URL du serveur faut TRUE
-				document.cookie = "DELTA_COOKIE_EXT_CONSENT=true;" + domain + ";" + path + ";" + samesite + ";" + expires;
+				//document.cookie = "DELTA_COOKIE_EXT_CONSENT=true;" + domain + ";" + path + ";" + samesite + ";" + expires;
+				document.cookie = "DELTA_COOKIE_EXT_CONSENT=true;" + domain + ";" + samesite + ";" + expires;
 			} else {
-				document.cookie = "DELTA_COOKIE_EXT_CONSENT=false;" + domain + ";" + path + ";" + samesite + ";" + expires;
+				//document.cookie = "DELTA_COOKIE_EXT_CONSENT=false;" + domain + ";" + path + ";" + samesite + ";" + expires;
+				document.cookie = "DELTA_COOKIE_EXT_CONSENT=false;" + domain + ";" + samesite + ";" + expires;
 			}
 
 		}
 
 		// Stocke le cookie d'acceptation
-		document.cookie = "DELTA_COOKIE_CONSENT=true;" + domain + ";" + path + ";" + samesite + ";" + expires;
+		//document.cookie = "DELTA_COOKIE_CONSENT=true;" + domain + ";" + path + ";" + samesite + ";" + expires;
+		document.cookie = "DELTA_COOKIE_CONSENT=true;" + domain + ";" + samesite + ";" + expires;
 	});
 
 
@@ -362,13 +364,20 @@ core.start = function() {
 	 * Check adresse email
 	 */
 	$("[type=email]").on("change", function() {
+		var text = "";
+		<?php if( $this->getData(['config', 'i18n', 'langAdmin' ]) === 'fr'){
+			echo 'text = "Format incorrect";' ;
+		}
+		else{
+			echo 'text = "Incorrect format";' ;
+		} ?>
 		var _this = $(this);
 		var pattern = /^([a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+(\.[a-z\d!#$%&'*+\-\/=?^_`{|}~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)*|"((([ \t]*\r\n)?[ \t]+)?([\x01-\x08\x0b\x0c\x0e-\x1f\x7f\x21\x23-\x5b\x5d-\x7e\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|\\[\x01-\x09\x0b\x0c\x0d-\x7f\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))*(([ \t]*\r\n)?[ \t]+)?")@(([a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\d\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.)+([a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]|[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF][a-z\d\-._~\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]*[a-z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])\.?$/i;
 		if(pattern.test(_this.val())) {
 			core.noticeRemove(_this.attr("id"));
 		}
 		else {
-			core.noticeAdd(_this.attr("id"), "Format incorrect");
+			core.noticeAdd(_this.attr("id"), text);
 		}
 	});
 
diff --git a/core/core.php b/core/core.php
index 1e17d5c..be1610e 100644
--- a/core/core.php
+++ b/core/core.php
@@ -48,7 +48,7 @@ class common {
 
 	// Numéro de version
 	const DELTA_UPDATE_URL = 'https://update.deltacms.fr/master/';
-	const DELTA_VERSION = '4.1.04';
+	const DELTA_VERSION = '4.1.05';
 	const DELTA_UPDATE_CHANNEL = "v4";
 
 	public static $actions = [];
@@ -182,7 +182,7 @@ class common {
 		'ca'	=> 'Catalan (ca)',
 		'co'	=> 'Corse (co)',
 		'eu'	=> 'Basque (eu)',
-		'none'	=>	'Autre langue'
+		'none'	=> 'Autre langue'
 	];
 	public static $i18nList_en = [
 		'en'	=> 'English (en)',
@@ -322,7 +322,7 @@ class common {
 			/**
 			 * Le cookie est prioritaire sur le navigateur
 			 * la traduction est celle de la langue du drapeau
-			 * */
+			 **/
 			if ( $this->getInput('DELTA_I18N_SCRIPT') !== substr($_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2 ) ) {
 				setrawcookie('googtrans', '/'.$this->getData(['config', 'i18n', 'langBase']).'/'.substr( $_SERVER["HTTP_ACCEPT_LANGUAGE"],0,2 ), time() + 3600, helper::baseUrl(false, false));
 			} else {
@@ -435,17 +435,28 @@ class common {
 	 * @param string $key Clef du champ
 	 */
 	public function addRequiredInputNotices($key) {
+		// Lexique
+		$text = [];
+		$val = $this->getData(['config', 'i18n', 'langAdmin']);
+		switch ($val) {
+			case 'fr' :
+				$text[0] = 'Obligatoire';
+				break;
+			case 'en' :
+				$text[0] = 'Mandatory';
+				break;
+		}
 		// La clef est un tableau
 		if(preg_match('#\[(.*)\]#', $key, $secondKey)) {
 			$firstKey = explode('[', $key)[0];
 			$secondKey = $secondKey[1];
 			if(empty($this->input['_POST'][$firstKey][$secondKey])) {
-				common::$inputNotices[$firstKey . '_' . $secondKey] = 'Obligatoire';
+				common::$inputNotices[$firstKey . '_' . $secondKey] = $text[0];
 			}
 		}
 		// La clef est une chaine
 		elseif(empty($this->input['_POST'][$key])) {
-			common::$inputNotices[$key] = 'Obligatoire';
+			common::$inputNotices[$key] = $text[0];
 		}
 	}
 
@@ -1046,13 +1057,14 @@ class common {
 	 * @param string $content Contenu
 	 * @return bool
 	 */
-	public function sendMail($to, $subject, $content, $replyTo = null) {
+	public function sendMail($to, $subject, $content, $replyTo = null, $file_name = '') {
 		// Layout
 		ob_start();
 		include 'core/layout/mail.php';
 		$layout = ob_get_clean();
 		$mail = new PHPMailer\PHPMailer\PHPMailer;
 		$mail->CharSet = 'UTF-8';
+		if( $this->getData(['config', 'i18n', 'langAdmin']) === 'fr')$mail->setLanguage('fr', 'core/class/phpmailer/phpmailer.lang-fr.php');
 		// Mail
 		try{
 			// Paramètres SMTP
@@ -1096,16 +1108,18 @@ class common {
 			$mail->Subject = $subject;
 			$mail->Body = $layout;
 			$mail->AltBody = strip_tags($content);
+			if($file_name !== '') $mail->addAttachment( self::FILE_DIR.'uploads/'.$file_name);
+			
 			if($mail->send()) {
 					return true;
 			}
 			else {
 					return $mail->ErrorInfo;
 			}
-		} catch (phpmailerException $e) {
-			return $e->errorMessage();
 		} catch (Exception $e) {
-			return $e->getMessage();
+			echo $e->errorMessage();
+		} catch (\Exception $e) {
+			echo $e->getMessage();
 		}
 	}
 
@@ -1238,7 +1252,8 @@ class common {
 	public function showSection() {
 		echo '<section>';
 		// Récupérer la config de la page courante
-		$blocks = explode('-',$this->getData(['page',$this->getUrl(0),'block']));
+		$blocks = [];
+		if( null !== $this->getData(['page',$this->getUrl(0),'block'])) $blocks = explode('-',$this->getData(['page',$this->getUrl(0),'block']));
 		// Initialiser
 		$blockleft=$blockright="";
 		switch (sizeof($blocks)) {
@@ -2662,9 +2677,9 @@ class core extends common {
 			exit();
 		}
 		// Journalisation
-		$dataLog = mb_detect_encoding(strftime('%d/%m/%y',time()), 'UTF-8', true)
-					? strftime('%d/%m/%y',time()) . ';' . strftime('%R',time()) . ';'
-					: utf8_encode(strftime('%d/%m/%y',time())) . ';' . utf8_encode(strftime('%R',time())) . ';' ;
+		$dataLog = mb_detect_encoding(date('d\/m\/y',time()), 'UTF-8', true)
+					? date('d\/m\/y',time()) . ';' . date('H\:i',time()) . ';'
+					: utf8_encode(date('d\/m\/y',time())) . ';' . utf8_encode(date('H\:i',time())) . ';' ;
 		$dataLog .= helper::getIp($this->getData(['config','connect','anonymousIp'])) . ';';
 		$dataLog .= $this->getUser('id') ? $this->getUser('id') . ';' : 'anonyme' . ';';
 		$dataLog .= $this->getUrl();
@@ -2748,7 +2763,8 @@ class core extends common {
 		 * - L'édition est ouverte depuis un temps dépassé, on considère que la page est restée ouverte et qu'elle ne sera pas validée
 		 */
 		foreach($this->getData(['user']) as $userId => $userIds){
-			$t = explode('/',$this->getData(['user', $userId, 'accessUrl']));
+			$t = [];
+			if( null !== $this->getData(['user', $userId, 'accessUrl'])) $t = explode('/',$this->getData(['user', $userId, 'accessUrl']));
 			if ( $this->getUser('id') &&
 				$userId !== $this->getUser('id') &&
 				$this->getData(['user', $userId,'accessUrl']) === $this->getUrl() &&
@@ -2809,11 +2825,16 @@ class core extends common {
 
 			if($access AND $this->getData(['page', $this->getUrl(0), 'moduleId'])) {
 				$moduleId = $this->getData(['page', $this->getUrl(0), 'moduleId']);
+				if( null === $this->getData(['module',$this->getUrl(0),'posts',$this->getUrl(1),'content'])){
+					$sub = '';
+				} else {
+					$sub = substr($this->getData(['module',$this->getUrl(0),'posts',$this->getUrl(1),'content']) ,0,159);
+				}
 				$this->addOutput([
 					'title' => $title,
 					// Meta description = 160 premiers caractères de l'article
 					'metaDescription' => $this->getData(['page',$this->getUrl(0),'moduleId']) === 'blog' && !empty($this->getUrl(1))
-										? strip_tags(substr($this->getData(['module',$this->getUrl(0),'posts',$this->getUrl(1),'content']) ,0,159))
+										? strip_tags($sub)
 										: $this->getData(['page', $this->getUrl(0), 'metaDescription']),
 					'metaTitle' => $this->getData(['page', $this->getUrl(0), 'metaTitle']),
 					'typeMenu' => $this->getData(['page', $this->getUrl(0), 'typeMenu']),
@@ -2844,13 +2865,15 @@ class core extends common {
 				// Check l'existence de l'action
 				$action = '';
 				$ignore = true;
-				foreach(explode('-', $this->getUrl(1)) as $actionPart) {
-					if($ignore) {
-						$action .= $actionPart;
-						$ignore = false;
-					}
-					else {
-						$action .= ucfirst($actionPart);
+				if( null !== $this->getUrl(1)){
+					foreach(explode('-', $this->getUrl(1)) as $actionPart) {
+						if($ignore) {
+							$action .= $actionPart;
+							$ignore = false;
+						}
+						else {
+							$action .= ucfirst($actionPart);
+						}
 					}
 				}
 				$action = array_key_exists($action, $module::$actions) ? $action : 'index';
diff --git a/core/include/update.inc.php b/core/include/update.inc.php
index dad45a2..70c6d91 100644
--- a/core/include/update.inc.php
+++ b/core/include/update.inc.php
@@ -53,5 +53,9 @@ if ($this->getData(['core', 'dataVersion']) < 4104) {
 	$this->setData(['core', 'dataVersion', 4104]);
 }
 
+if ($this->getData(['core', 'dataVersion']) < 4105) {
 
+	// Mise à jour
+	$this->setData(['core', 'dataVersion', 4105]);
+}
 ?>
diff --git a/core/layout/common.css b/core/layout/common.css
index c0aca6a..0a58f6e 100644
--- a/core/layout/common.css
+++ b/core/layout/common.css
@@ -1354,6 +1354,11 @@ input[type='checkbox']:disabled+label:before {
 	margin: 5px 0 5px;
 }
 
+/* Paramètres de Input File dans form */
+.formInputFile {
+
+}
+
 
 /**
  * Grille
diff --git a/core/layout/main.php b/core/layout/main.php
index b117f33..9364782 100644
--- a/core/layout/main.php
+++ b/core/layout/main.php
@@ -26,9 +26,11 @@ if( $this->getInput('DELTA_I18N_SITE') !== '' && $this->getInput('DELTA_I18N_SIT
 		<?php if (file_exists(self::DATA_DIR .'head.inc.html')) {
 			include(self::DATA_DIR .'head.inc.html');
 		}?>
-		<?php if( $_SESSION['screenshot'] === 'on'){ ?>
-			<script src="./core/vendor/screenshot/html2canvas.min.js"></script>
-		<?php } ?>
+		<?php 
+		if( isset ($_SESSION['screenshot'] )){
+			if( $_SESSION['screenshot'] === 'on'){ ?>
+				<script src="./core/vendor/screenshot/html2canvas.min.js"></script>
+		<?php } }?>
 	</head>
 	<body>
 		<!-- Barre d'administration -->
@@ -64,9 +66,10 @@ if( $this->getInput('DELTA_I18N_SITE') !== '' && $this->getInput('DELTA_I18N_SIT
 		} ?>
 		
 		<!-- div screenshot -->
-		<?php if( $_SESSION['screenshot'] === 'on'){ ?>
-			<div id="main_screenshot">
-		<?php } ?>
+		<?php if( isset ($_SESSION['screenshot'] )){
+			if( $_SESSION['screenshot'] === 'on'){ ?>
+				<div id="main_screenshot">
+		<?php }} ?>
 
 			<!-- Menu dans le fond du site avant la bannière -->
 			<?php if($this->getData(['theme', 'menu', 'position']) === 'body-first' || $this->getData(['theme', 'menu', 'position']) === 'top' ): ?>
@@ -217,10 +220,11 @@ if( $this->getInput('DELTA_I18N_SITE') !== '' && $this->getInput('DELTA_I18N_SIT
 			<?php echo $this->getData(['theme', 'footer', 'position']) === 'site'? '</div>' : '';?>
 
 		<!-- fin de la div main_screenshot et bouton screenshot -->
-		<?php if( $_SESSION['screenshot'] === 'on'){ ?>
-			</div>
-			<div><button id="screenshot" class="buttonScreenshot" type="button" ><img src="<?php echo helper::baseUrl(false); ?>core/vendor/screenshot/appareil_photo.png" width="100px"/></button></div>
-		<?php } ?>
+		<?php if( isset ($_SESSION['screenshot'] )){
+			if( $_SESSION['screenshot'] === 'on'){ ?>
+				</div>
+				<div><button id="screenshot" class="buttonScreenshot" type="button" ><img src="<?php echo helper::baseUrl(false); ?>core/vendor/screenshot/appareil_photo.png" width="100px"/></button></div>
+		<?php }}?>
 		
 		<!-- Lien remonter en haut -->
 		<div id="backToTop"><?php echo template::ico('up'); ?></div>
diff --git a/core/module/config/config.php b/core/module/config/config.php
index d6a2c07..d6fb2e8 100644
--- a/core/module/config/config.php
+++ b/core/module/config/config.php
@@ -25,7 +25,6 @@ class config extends common {
 		'generateFiles' => self::GROUP_ADMIN,
 		'index' => self::GROUP_ADMIN,
 		'restore' => self::GROUP_ADMIN,
-		'updateBaseUrl' => self::GROUP_ADMIN,
 		'script' => self::GROUP_ADMIN,
 		'logReset' => self::GROUP_ADMIN,
 		'logDownload'=> self::GROUP_ADMIN,
@@ -405,62 +404,19 @@ class config extends common {
 					$files [] = ( basename( $stat['name'] ));
 				}
 
-				// Lire la dataversion
-				$tmpDir = uniqid(4);
-				$success = $zip->extractTo( self::TEMP_DIR . $tmpDir );
-				$data = file_get_contents( self::TEMP_DIR . $tmpDir . '/data/core.json');
-				$obj = json_decode($data);
-				$dataVersion = strval ($obj->core->dataVersion);
-				switch (strlen($dataVersion)) {
-					case 4:
-						if (substr($dataVersion,0,1) === '9' ) {
-							$version = 9;
-						} else {
-							$version = 0;
-						}
-						break;
-					case 5:
-						$version = substr($dataVersion,0,2);
-						break;
-					default:
-						$version = 0;
-						break;
-				}
-				$this->removeDir(self::TEMP_DIR . $tmpDir );
+				// Option active, les users sont stockées
+				if ($this->getInput('configRestoreImportUser', helper::FILTER_BOOLEAN) === true ) $users = $this->getData(['user']);
 
-				if ($version >= 10 )	{
-						// Option active, les users sont stockées
-						if ($this->getInput('configRestoreImportUser', helper::FILTER_BOOLEAN) === true ) {
-							$users = $this->getData(['user']);
-					}
-				} elseif ($version === 0) { // Version invalide
-					// Valeurs en sortie erreur
-					$this->addOutput([
-						'title' => $text[0],
-						'view' => 'restore',
-						'notification' => $text[3],
-						'state' => false
-					]);
-				}
-				// Préserver les comptes des utilisateurs d'une version 9 si option cochée
-				// Positionnement d'une  variable de session lue au constructeurs
-				if ($version === 9) {
-					$_SESSION['KEEP_USERS'] = $this->getInput('configRestoreImportUser', helper::FILTER_BOOLEAN);
-				}
 				// Extraire le zip ou 'site/'
 				$this->removeDir(self::DATA_DIR);
 				$success = $zip->extractTo( 'site/' );
 				// Fermer l'archive
 				$zip->close();
 
-
 				// Restaurer les users originaux d'une v10 si option cochée
-				if (!empty($users) &&
-					$version >= 10 &&
-					$this->getInput('configRestoreImportUser', helper::FILTER_BOOLEAN) === true) {
-						$this->setData(['user',$users]);
-				}
+				if (!empty($users) && $this->getInput('configRestoreImportUser', helper::FILTER_BOOLEAN) === true) $this->setData(['user',$users]);
 			}
+			
 			// Message de notification
 			$notification  = $success === true ? $text[4] : $text[5] ;
 			$redirect = $this->getInput('configRestoreImportUser', helper::FILTER_BOOLEAN) === true ?  helper::baseUrl() . 'config/restore' : helper::baseUrl() . 'user/login/';
@@ -757,75 +713,6 @@ class config extends common {
 		]);
 	}
 
-	/**
-	 * Met à jour les données de site avec l'adresse transmise
-	 */
-	public function updateBaseUrl () {
-		// Lexique
-		$text = [];
-		$val = $this->getData(['config', 'i18n', 'langAdmin']);
-		switch ($val) {
-			case 'fr' :
-				$text[0] = 'Restaurer';
-				$text[1] = ' conversion';
-				$text[2] = ' effectuée';
-				$text[3] = 'Aucune conversion';
-				break;
-			case 'en' :
-				$text[0] = 'Restore';
-				$text[1] = ' conversion';
-				$text[2] = ' performed';
-				$text[3] = 'No conversion';
-				break;
-		}
-		// Supprimer l'information de redirection
-		$old = str_replace('?','',$this->getData(['core', 'baseUrl']));
-		$new = helper::baseUrl(false,false);
-		$c3 = 0;
-		$success = false ;
-		// Boucler sur les pages
-		foreach($this->getHierarchy(null,null,null) as $parentId => $childIds) {
-			$content = $this->getPage($parentId, self::$i18n);
-			$content =   $titre . ' ' . $content ;
-			$replace = str_replace( 'href="' . $old , 'href="'. $new , stripslashes($content),$c1) ;
-			$replace = str_replace( 'src="' . $old , 'src="'. $new , stripslashes($replace),$c2) ;
-
-			if ($c1 > 0 || $c2 > 0) {
-				$success = true;
-				$this->setPage($parentId, $replace,  self::$i18n);
-				$c3 += $c1 + $c2;
-			}
-			foreach($childIds as $childId) {
-				$content = $this->getPage($childId, self::$i18n);
-				$content =   $titre . ' ' . $content ;
-				$replace = str_replace( 'href="' . $old , 'href="'. $new , stripslashes($content),$c1) ;
-				$replace = str_replace( 'src="' . $old , 'src="'. $new , stripslashes($replace),$c2) ;
-				if ($c1 > 0 || $c2 > 0) {
-					$success = true;
-					$this->setPage($childId, $replace,  self::$i18n);
-					$c3 += $c1 + $c2;
-				}
-			}
-		}
-		// Traiter les modules dont la redirection
-		$content = $this->getdata(['module']);
-		$replace = $this->recursive_array_replace('href="' . $old , 'href="'. $new, $content, $c1);
-		$replace = $this->recursive_array_replace('src="' . $old , 'src="'. $new, $replace, $c2);
-		if ($content !== $replace) {
-			$this->setdata(['module',$replace]);
-			$c3 += $c1 + $c2;
-			$success = true;
-		}
-		// Mettre à jour la base URl
-		$this->setData(['core','baseUrl',helper::baseUrl(true,false)]);
-		// Valeurs en sortie
-		$this->addOutput([
-			'title' => $text[0],
-			'view' => 'restore',
-			'notification' => $success ? $c3. $text[1] . ($c3 > 1 ? 's' : '') . $text[2] . ($c3 > 1 ? 's' : '') : $text[3],
-			'state' => $success ? true : false
-		]);
-	}
 
 	/**
 	 * Vider le fichier de log
diff --git a/core/module/config/view/restore/restore.php b/core/module/config/view/restore/restore.php
index c1b907f..67d979b 100644
--- a/core/module/config/view/restore/restore.php
+++ b/core/module/config/view/restore/restore.php
@@ -10,13 +10,6 @@ switch ($val) {
 		$text[3] = 'Sélectionnez une archive au format ZIP';
 		$text[4] = 'L\'archive a été déposée dans le gestionnaire de fichiers.';
 		$text[5] = 'Préserver les comptes des utilisateurs déjà installés';
-		$text[6] = 'Conversion après la restauration';
-		$text[7] = 'Conversion des URL des ressources multimédia entre deux sites aux arborescences différentes.';
-		$text[8] = 'Pas de donnée dans la sauvegarde';
-		$text[9] = 'Dossier de l\'archive';
-		$text[10] = 'Le dossier de base du site est stockée dans la sauvegarde.';
-		$text[11] = 'Dossier du site actuel';
-		$text[12] = 'Convertir';
 		break;
 	case 'en' :
 		$text[0] = 'Return';
@@ -25,13 +18,6 @@ switch ($val) {
 		$text[3] = 'Select an archive in ZIP format';
 		$text[4] = 'The archive has been dropped into the file manager.';
 		$text[5] = 'Preserve user accounts already installed';
-		$text[6] = 'Convert after restore';
-		$text[7] = 'Conversion of media URLs between two sites with different trees';
-		$text[8] = 'No data in backup';
-		$text[9] = 'Archive folder';
-		$text[10] = 'The site\'s base folder is stored in the backup';
-		$text[11] = 'Current site folder';
-		$text[12] = 'Convert';
 		break;
 }
 ?>
@@ -75,46 +61,4 @@ switch ($val) {
 		</div>
 	</div>
 </div>
-<div class="row">
-	<div class="col12">
-		<div class="block">
-			<h4><?php echo $text[6]; echo template::help($text[7]);?></h4>
-			<div class="row">
-				<div class="col4 offset1">
-					<?php
-					if (is_null($this->getData(['core', 'baseUrl'])) ) {
-						$baseUrlValue = $text[8];
-						$buttonClass = 'disabled';
-					} elseif ($this->getData(['core', 'baseUrl']) === '') {
-						$baseUrlValue = '/';
-						$buttonClass = helper::baseUrl(false,false) !== $this->getData(['core', 'baseUrl']) ? '' : 'disabled';
-					} else {
-						$baseUrlValue = str_replace('?','',$this->getData(['core', 'baseUrl']));
-						$buttonClass = helper::baseUrl(false,false) !== $baseUrlValue ? '' : 'disabled';
-					}
-					echo template::text('configRestoreBaseURLToConvert', [
-						'label' => $text[9] ,
-						'value' => $baseUrlValue,
-						'readonly' => true,
-						'help'  => $text[10]
-					]); ?>
-				</div>
-				<div class="col4">
-					<?php echo template::text('configRestoreCurrentURL', [
-						'label' => $text[11],
-						'value' => helper::baseUrl(false,false),
-						'readonly' => true
-					]); ?>
-				</div>
-				<div class="col2 verticalAlignMiddle">
-					<?php echo template::button('configRestoreUpdateBaseURLButton', [
-						'href' => helper::baseUrl() . 'config/updateBaseUrl',
-						'class' => $buttonClass,
-						'value' => $text[12]
-					]); ?>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
 <?php echo template::formClose(); ?>
diff --git a/core/module/install/ressource/defaultdata.php b/core/module/install/ressource/defaultdata.php
index d229c8f..5ac604a 100644
--- a/core/module/install/ressource/defaultdata.php
+++ b/core/module/install/ressource/defaultdata.php
@@ -70,7 +70,7 @@ class init extends common {
 			]
 		],
 		'core' => [
-			'dataVersion' => 4104,
+			'dataVersion' => 4105,
 			'lastBackup' => 0,
 			'lastClearTmp' => 0,
 			'lastAutoUpdate' => 0,
@@ -805,7 +805,8 @@ class init extends common {
 				'config' => [
 					'feeds' => true,
 					'feedsLabel' => 'Syndication RSS',
-					'itemsperPage' => 4
+					'itemsperPage' => 4,
+					'versionData' => '6.0'
 				],
 				'texts' => [
 					'NoComment' => 'Pas encore de commentaire',
diff --git a/core/module/page/page.php b/core/module/page/page.php
index e7c35c0..852bc62 100644
--- a/core/module/page/page.php
+++ b/core/module/page/page.php
@@ -207,7 +207,7 @@ class page extends common {
 				'group' => self::GROUP_VISITOR,
 				'targetBlank' => false,
 				'title' => $pageTitle,
-				'shortTitle' => $pageTitle,
+				'shortTitle' => '',
 				'block' => '12',
 				'barLeft' => '',
 				'barRight' => '',
diff --git a/core/module/page/view/edit/edit.js.php b/core/module/page/view/edit/edit.js.php
index e70d3d6..7a2ce82 100644
--- a/core/module/page/view/edit/edit.js.php
+++ b/core/module/page/view/edit/edit.js.php
@@ -526,7 +526,12 @@ pageTypeMenuDOM.on("change", function() {
 	}
 });
 
-
+/**
+ * Duplication du champ Title dans Short title
+ */
+$("#pageEditTitle").on("input", function() {
+	$("#pageEditShortTitle").val($(this).val());
+});
 
 
 /**
diff --git a/core/module/user/user.php b/core/module/user/user.php
index 65abe2c..8749390 100644
--- a/core/module/user/user.php
+++ b/core/module/user/user.php
@@ -657,9 +657,9 @@ class user extends common {
 			}
 		}
 		// Journalisation
-		$dataLog = mb_detect_encoding(strftime('%d/%m/%y',time()), 'UTF-8', true)
-				? strftime('%d/%m/%y',time()) . ';' . strftime('%R',time()) . ';'
-				: utf8_encode(strftime('%d/%m/%y',time())) . ';' . utf8_encode(strftime('%R',time())) . ';' ;
+		$dataLog = mb_detect_encoding(date('d\/m\/y',time()), 'UTF-8', true)
+				? date('d\/m\/y',time()) . ';' . date('H\:i',time()) . ';'
+				: utf8_encode(date('d\/m\/y',time())) . ';' . utf8_encode(date('H\:i',time())) . ';' ;
 		$dataLog .= helper::getIp($this->getData(['config','connect','anonymousIp'])) . ';';
 		$dataLog .= $this->getInput('userLoginId', helper::FILTER_ID) . ';' ;
 		$dataLog .= $this->getUrl() .';' ;
diff --git a/core/vendor/filemanager/config/config.php b/core/vendor/filemanager/config/config.php
index 0ff4f6c..603bb49 100644
--- a/core/vendor/filemanager/config/config.php
+++ b/core/vendor/filemanager/config/config.php
@@ -3,15 +3,27 @@ $version = "9.14.0";
 if (session_id() == '') session_start();
 
 mb_internal_encoding('UTF-8');
-mb_http_output('UTF-8');
-mb_http_input('UTF-8');
+mb_http_output();
+mb_http_input();
 mb_language('uni');
 if (function_exists('mb_regex_encoding')) {
 	mb_regex_encoding('UTF-8');
 }
 ob_start('mb_output_handler');
-date_default_timezone_set('Europe/Paris');
-setlocale(LC_CTYPE, 'fr_FR'); //correct transliteration
+
+// Langage et locales fonction de la langue d'administration
+$json = file_get_contents('../../../site/data/config.json');
+$tab = json_decode($json, true);
+$langAdmin = $tab['config']['i18n']['langAdmin'];
+if($langAdmin === 'fr'){
+	date_default_timezone_set('Europe/Paris');
+	setlocale(LC_CTYPE, 'fr_FR', 'fr'); //correct transliteration
+	$_SESSION['RF']['language']= 'fr_FR';
+} else {
+	date_default_timezone_set('Europe/London');
+	setlocale(LC_CTYPE, 'en_GB', 'en'); //correct transliteration
+	$_SESSION['RF']['language']= 'en_EN';
+}
 
 /* Lecture du groupe de l'utilisateur connecté pour attribuer les droits et les dossiers */
 $userId = $_COOKIE['DELTA_USER_ID'];
diff --git a/module/blog/blog.php b/module/blog/blog.php
index 8214bbb..3da490c 100644
--- a/module/blog/blog.php
+++ b/module/blog/blog.php
@@ -438,9 +438,9 @@ class blog extends common {
 				]);
 			}
 			self::$comments[] = [
-				mb_detect_encoding(strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
-				? strftime('%d %B %Y - %H:%M', $comment['createdOn'])
-				: utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn'])),
+				mb_detect_encoding(date('d\/m\/Y\ \-\ H\:i', $comment['createdOn']), 'UTF-8', true)
+				? date('d\/m\/Y\ \-\ H\:i', $comment['createdOn'])
+				: utf8_encode(date('d\/m\/Y\ \-\ H\:i', $comment['createdOn'])),
 				$comment['content'],
 				$comment['userId'] ? $this->getData(['user', $comment['userId'], 'firstname']) . ' ' . $this->getData(['user', $comment['userId'], 'lastname']) : $comment['author'],
 				$buttonApproval,
@@ -675,12 +675,12 @@ class blog extends common {
 					$approved = count($this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i],'comment']));
 				}
 				// Met en forme le tableau
-				$date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-					? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
-					: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
-				$heure =   mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
-				? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
-				: utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+				$date = mb_detect_encoding(date('d\/m\/Y', $this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+					? date('d\/m\/Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+					: utf8_encode(date('d\/m\/Y', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
+				$heure =   mb_detect_encoding(date('H\:i', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])), 'UTF-8', true)
+				? date('H\:i', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn']))
+				: utf8_encode(date('H\:i', $this->getData(['module', $this->getUrl(0), 'posts', $articleIds[$i], 'publishedOn'])));
 				self::$articles[] = [
 					'<a href="' . helper::baseurl() . $this->getUrl(0) . '/' . $articleIds[$i] . '" target="_blank" >' .
 					$this->getData(['module', $this->getUrl(0),  'posts', $articleIds[$i], 'title']) .
diff --git a/module/blog/view/article/article.php b/module/blog/view/article/article.php
index 96fd21e..98eb8a5 100644
--- a/module/blog/view/article/article.php
+++ b/module/blog/view/article/article.php
@@ -36,8 +36,19 @@ echo '<script src="'. helper::baseUrl(false).'core/vendor/tinymce/init.js"></scr
 echo '<script src="'. helper::baseUrl(false).'core/vendor/tinymce/init.css"></script>';
 
 // Pour les dates suivant la langue d'administration
-setlocale(LC_TIME, 'fr_FR');
-if( $this->getData(['config', 'i18n', 'langAdmin']) === 'en') setlocale(LC_TIME, 'en_GB');
+$lang = 'fr_FR'; 
+$zone = 'Europe/Paris';
+if ( $this->getData(['config', 'i18n', 'langAdmin']) === 'en'){
+	$lang = 'en_GB';
+	$zone = 'Europe/London';
+}
+$fmt = datefmt_create(
+    $lang,
+    IntlDateFormatter::LONG,
+    IntlDateFormatter::SHORT,
+    $zone,
+    IntlDateFormatter::GREGORIAN
+);
 ?>
 
 <div class="row">
@@ -56,14 +67,7 @@ if( $this->getData(['config', 'i18n', 'langAdmin']) === 'en') setlocale(LC_TIME,
 		<!-- bloc signature et date -->
 		<?php echo $module::$articleSignature . ' - ';?>
 		<i class="far fa-calendar-alt"></i>
-		<?php $date = mb_detect_encoding(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-						? strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-						: utf8_encode(strftime('%d %B %Y', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
-				$heure =  mb_detect_encoding(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])), 'UTF-8', true)
-						? strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn']))
-						:  utf8_encode(strftime('%H:%M', $this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])));
-				echo $date .' - ' . $heure;
-		?>
+		<?php echo datefmt_format($fmt, strtotime( date('Y/m/d H:i:s',$this->getData(['module', $this->getUrl(0), 'posts', $this->getUrl(1), 'publishedOn'])))); ?>
 		<!-- Bloc edition -->
 		<?php if (
 
@@ -190,9 +194,9 @@ if( $this->getData(['config', 'i18n', 'langAdmin']) === 'en') setlocale(LC_TIME,
 		<?php foreach($module::$comments as $commentId => $comment): ?>
 			<div class="block">
 				<h4><?php echo $module::$commentsSignature[$commentId]; ?>
-				<?php echo ' - ';  echo mb_detect_encoding(strftime('%d %B %Y - %H:%M', $comment['createdOn']), 'UTF-8', true)
-										? strftime('%d %B %Y - %H:%M', $comment['createdOn'])
-										: utf8_encode(strftime('%d %B %Y - %H:%M', $comment['createdOn']));
+				<?php echo ' - ';  echo mb_detect_encoding(date('d\/m\/Y\ \-\ H\:i', $comment['createdOn']), 'UTF-8', true)
+										? date('d\/m\/Y\ \-\ H\:i', $comment['createdOn'])
+										: utf8_encode(date('d\/m\/Y\ \-\ H\:i', $comment['createdOn']));
 				?>
 				</h4>
 				<?php echo $comment['content']; ?>
diff --git a/module/blog/view/index/index.php b/module/blog/view/index/index.php
index 14f04eb..3588929 100644
--- a/module/blog/view/index/index.php
+++ b/module/blog/view/index/index.php
@@ -10,10 +10,21 @@ switch ($val) {
 		$text[0] = 'Read more';
 		break;
 }
-?>
-<?php setlocale(LC_TIME, 'fr_FR');
-if( $this->getData(['config', 'i18n', 'langAdmin']) === 'en') setlocale(LC_TIME, 'en_GB'); ?>
-<?php if($module::$articles): ?>
+// Pour les dates suivant la langue d'administration
+$lang = 'fr_FR'; 
+$zone = 'Europe/Paris';
+if ( $this->getData(['config', 'i18n', 'langAdmin']) === 'en'){
+	$lang = 'en_GB';
+	$zone = 'Europe/London';
+}
+$fmt = datefmt_create(
+    $lang,
+    IntlDateFormatter::LONG,
+    IntlDateFormatter::SHORT,
+    $zone,
+    IntlDateFormatter::GREGORIAN
+);
+if($module::$articles): ?>
 	<div class="row">
 		<div class="col12">
 			<?php foreach($module::$articles as $articleId => $article): ?>
@@ -51,9 +62,7 @@ if( $this->getData(['config', 'i18n', 'langAdmin']) === 'en') setlocale(LC_TIME,
 						</div>
 						<div class="blogDate">
 							<i class="far fa-calendar-alt"></i>
-							<?php echo mb_detect_encoding(strftime('%d %B %Y - %H:%M',  $article['publishedOn']), 'UTF-8', true)
-										? strftime('%d %B %Y', $article['publishedOn'])
-										: utf8_encode(strftime('%d %B %Y', $article['publishedOn']));  ?>
+							<?php echo datefmt_format($fmt, strtotime( date('Y/m/d H:i:s',$article['publishedOn']))); ?>
 						</div>
 						<p class="blogContent">
 							<?php echo helper::subword(strip_tags($article['content']), 0, 400); ?>...
diff --git a/module/form/form.php b/module/form/form.php
index 7ff7eae..8768142 100644
--- a/module/form/form.php
+++ b/module/form/form.php
@@ -18,7 +18,7 @@
  
 class form extends common {
 
-	const VERSION = '3.0';
+	const VERSION = '4.0';
 	const REALNAME = 'Formulaire';
 	const DELETE = true;
 	const UPDATE = '0.0';
@@ -26,6 +26,7 @@ class form extends common {
 
 	public static $actions = [
 		'config' => self::GROUP_MODERATOR,
+		'update' => self::GROUP_MODERATOR,
 		'data' => self::GROUP_MODERATOR,
 		'delete' => self::GROUP_MODERATOR,
 		'deleteall' => self::GROUP_MODERATOR,
@@ -49,6 +50,7 @@ class form extends common {
 	const TYPE_DATETIME = 'date';
 	const TYPE_CHECKBOX = 'checkbox';
 	const TYPE_LABEL = 'label';
+	const TYPE_FILE = 'file';
 	const ITEMSPAGE = 10;
 
 
@@ -59,7 +61,8 @@ class form extends common {
 		self::TYPE_MAIL => 'Champ mail',
 		self::TYPE_SELECT => 'Sélection',
 		self::TYPE_CHECKBOX => 'Case à cocher',
-		self::TYPE_DATETIME => 'Date'
+		self::TYPE_DATETIME => 'Date',
+		self::TYPE_FILE => 'fichier'
 	];
 	public static $types_en = [
 		self::TYPE_LABEL => 'Label',
@@ -68,12 +71,13 @@ class form extends common {
 		self::TYPE_MAIL => 'Mail field',
 		self::TYPE_SELECT => 'Selection',
 		self::TYPE_CHECKBOX => 'Check box',
-		self::TYPE_DATETIME => 'Date'
+		self::TYPE_DATETIME => 'Date',
+		self::TYPE_FILE => 'file'
 	];
 
 	public static $listUsers = [
 	];
-
+	
 	public static $signature = [
 		'text' => 'Nom du site',
 		'logo' => 'Logo du site'
@@ -88,7 +92,23 @@ class form extends common {
 		'80' => '80%',
 		'100' => '100%'
 	];
-
+	public static $maxSizeUpload = [
+		'100000' => '100Ko',
+		'200000' => '200Ko',
+		'500000' => '500Ko',
+		'1000000' => '1Mo',
+		'2000000' => '2Mo',
+		'5000000' => '5Mo'
+	];
+	
+	/**
+	 * Mise à jour du module
+	 */
+	public function update() {
+		if( null === $this->getData(['module', $this->getUrl(0), 'config', 'maxSizeUpload'])) $this->setData(['module', $this->getUrl(0), 'config', 'maxSizeUpload', '500000']);
+	}
+	
+	
 	/**
 	 * Configuration
 	 */
@@ -131,7 +151,8 @@ class form extends common {
 					'replyto' => $this->getInput('formConfigMailReplyTo', helper::FILTER_BOOLEAN),
 					'signature' => $this->getInput('formConfigSignature'),
 					'logoUrl' => $this->getInput('formConfigLogo'),
-					'logoWidth' => $this->getInput('formConfigLogoWidth')
+					'logoWidth' => $this->getInput('formConfigLogoWidth'),
+					'maxSizeUpload' => $this->getInput('formConfigMaxSize')
 				]
 			]);
 			// Génération des données vides
@@ -381,6 +402,8 @@ class form extends common {
 	 * Accueil
 	 */
 	public function index() {
+		// Mise à jour du module
+		$this->update();
 		// Lexique
 		$text = [];
 		$val = $this->getData(['config', 'i18n', 'langAdmin']);
@@ -390,12 +413,24 @@ class form extends common {
 				$text[1] = 'Nouveau message en provenance de votre site';
 				$text[2] = 'Nouveau message en provenance de la page "';
 				$text[3] = 'Formulaire soumis';
+				$text[4] = 'La pièce jointe n\'est pas une image';
+				$text[5] = '?';
+				$text[6] = 'La taille du fichier excède ';
+				$text[7] = 'L\'extension du fichier doit être jpg, jpeg, png ou gif';
+				$text[8] = 'Erreur pendant le téléversement du fichier';
+				$text[9] = 'échec le message n\'est pas envoyé car ';
 				break;
 			case 'en' :
 				$text[0] = 'Incorrect';
 				$text[1] = 'New message from your site';
 				$text[2] = 'New message from the page "';
 				$text[3] = 'Form submitted';
+				$text[4] = 'File is not an image';
+				$text[5] = '?';
+				$text[6] = 'File size exceeds ';
+				$text[7] = 'The file extension must be jpg, jpeg, png or gif';
+				$text[8] = 'Error while uploading file' ;
+				$text[9] = 'failure, the message is not sent because ';
 				break;
 		}
 		// Soumission du formulaire
@@ -413,20 +448,32 @@ class form extends common {
 			$data = [];
 			$replyTo = null;
 			$content = '';
+			// $notice concerne la pièce jointe
+			$notice = '';
 			foreach($this->getData(['module', $this->getUrl(0), 'input']) as $index => $input) {
 				// Filtre la valeur
 				switch($input['type']) {
 					case self::TYPE_MAIL:
 						$filter = helper::FILTER_MAIL;
+						$this->setData(['module', $this->getUrl(0), 'draft', 'mail', $this->getInput('formInput[' . $index . ']')]);
 						break;
 					case self::TYPE_TEXTAREA:
 						$filter = helper::FILTER_STRING_LONG;
+						$this->setData(['module', $this->getUrl(0), 'draft', 'textarea', $this->getInput('formInput[' . $index . ']')]);
 						break;
 					case self::TYPE_DATETIME:
 						$filter = helper::FILTER_STRING_SHORT; // Mettre TYPE_DATETIME pour récupérer un TIMESTAMP
+						$this->setData(['module', $this->getUrl(0), 'draft', 'datetime', $this->getInput('formInput[' . $index . ']')]);
 						break;
 					case self::TYPE_CHECKBOX:
 						$filter = helper::FILTER_BOOLEAN;
+						$this->setData(['module', $this->getUrl(0), 'draft', 'checkbox', $this->getInput('formInput[' . $index . ']')]);
+						break;
+					case self::TYPE_SELECT:
+						$this->setData(['module', $this->getUrl(0), 'draft', 'select', $this->getInput('formInput[' . $index . ']')]);
+						break;
+					case self::TYPE_TEXT:
+						$this->setData(['module', $this->getUrl(0), 'draft', 'text', $this->getInput('formInput[' . $index . ']')]);
 						break;
 					default:
 						$filter = helper::FILTER_STRING_SHORT;
@@ -437,63 +484,129 @@ class form extends common {
 					$input['type'] === 'mail') {
 					$replyTo = $value;
                 }
+				
+				// Traitement de la pièce jointe, fichier avec extension valide de taille maximum $sizeMax
+				// Fichier chargé dans site/file/uploads/ et effacé après l'envoi du mail
+				if( $input['type'] === 'file'){
+					$target_dir = self::FILE_DIR.'uploads';
+					$sizeMax = $this->getData(['module', $this->getUrl(0), 'config', 'maxSizeUpload']);
+					$extensions_valides = array( 'jpg' , 'jpeg' , 'gif' , 'png');
+					$extensions_images = array( 'jpg' , 'jpeg' , 'gif' , 'png' );
+					$file_name = basename($_FILES["fileToUpload"]["name"]);
+					if( $_FILES["fileToUpload"]["error"] === 0){
+						if($file_name !== '' && $file_name !== null){
+							if( ! is_dir( $target_dir )) mkdir( $target_dir, 0744);
+							// Copie du fichier .htaccess depuis module/form/ressource
+							copy('./module/form/ressource/.htaccess', $target_dir.'/.htaccess');
+							$target_file = $target_dir .'/'. $file_name;
+							$imageFileType = strtolower(pathinfo($target_file,PATHINFO_EXTENSION));
+
+							// Vérification que la pièce jointe est une image quand son extension est celle d'une image
+							if( $_FILES["fileToUpload"]["tmp_name"] !== '' && $_FILES["fileToUpload"]["tmp_name"] !== null
+								&& in_array($imageFileType,$extensions_images)){
+								$check = getimagesize($_FILES["fileToUpload"]["tmp_name"]);
+								if($check === false) $notice = $text[4];
+							}
+
+							// Vérification de la taille du fichier
+							if ($_FILES["fileToUpload"]["size"] > $sizeMax) $notice = $text[6].intval($sizeMax/1000).' Ko';
+
+							// Vérification des types de fichiers autorisés
+							if( ! in_array($imageFileType,$extensions_valides) ) $notice = $text[7];
+
+							// Upload du fichier
+							if ($notice === '') {
+							  if (move_uploaded_file($_FILES["fileToUpload"]["tmp_name"], $target_file)) {
+								$value = $file_name;
+							  } else {
+								$notice = $text[8];
+							  }
+							}
+						}
+					} else {
+						switch($_FILES["fileToUpload"]["error"]) {
+							case 2 :
+								$notice = $text[6].' MAX_FILE_SIZE : 5Mo';
+								break;
+							default:
+								$notice = $text[8];
+						}
+					}
+				}
+				
+				
 				// Préparation des données pour la création dans la base
 				$data[$this->getData(['module', $this->getUrl(0), 'input', $index, 'name'])] = $value;
 				// Préparation des données pour le mail
 				$content .= '<strong>' . $this->getData(['module', $this->getUrl(0), 'input', $index, 'name']) . ' :</strong> ' . $value . '<br>';
 			}
-			// Crée les données
-			$this->setData(['module', $this->getUrl(0), 'data', helper::increment(1, $this->getData(['module', $this->getUrl(0), 'data'])), $data]);
-			// Envoi du mail
-			// Rechercher l'adresse en fonction du mail
-			$sent = true;
-			$singleuser = $this->getData(['user',
-										  $this->getData(['module', $this->getUrl(0), 'config', 'user']),
-										  'mail']);
-			$singlemail = $this->getData(['module', $this->getUrl(0), 'config', 'mail']);
-			$group = $this->getData(['module', $this->getUrl(0), 'config', 'group']);
-			// Verification si le mail peut être envoyé
-			if(
-				self::$inputNotices === [] && (
-					$group > 0 ||
-					$singleuser !== '' ||
-					$singlemail !== '' )
-			) {
-				// Utilisateurs dans le groupe
-				$to = [];
-				if ($group > 0){
-					foreach($this->getData(['user']) as $userId => $user) {
-						if($user['group'] >= $group) {
-							$to[] = $user['mail'];
+			// Si absence d'erreur sur la pièce jointe
+			if( $notice === ''){
+				// Crée les données
+				$this->setData(['module', $this->getUrl(0), 'data', helper::increment(1, $this->getData(['module', $this->getUrl(0), 'data'])), $data]);
+				$sent = true;
+				// Emission du mail
+				// Rechercher l'adresse en fonction du mail
+				$singleuser = $this->getData(['user',
+											  $this->getData(['module', $this->getUrl(0), 'config', 'user']),
+											  'mail']);
+				$singlemail = $this->getData(['module', $this->getUrl(0), 'config', 'mail']);
+				$group = $this->getData(['module', $this->getUrl(0), 'config', 'group']);
+				// Verification si le mail peut être envoyé
+				if(
+					self::$inputNotices === [] && (
+						$group > 0 ||
+						$singleuser !== '' ||
+						$singlemail !== '' )
+				) {
+					// Utilisateurs dans le groupe
+					$to = [];
+					if ($group > 0){
+						foreach($this->getData(['user']) as $userId => $user) {
+							if($user['group'] >= $group) {
+								$to[] = $user['mail'];
+							}
 						}
 					}
-				}
-				// Utilisateur désigné
-				if (!empty($singleuser)) {
-					$to[] = $singleuser;
-				}
-				// Mail désigné
-				if (!empty($singlemail)) {
-					$to[] = $singlemail;
-				}
-				if($to) {
-					// Sujet du mail
-					$subject = $this->getData(['module', $this->getUrl(0), 'config', 'subject']);
-					if($subject === '') {
-						$subject = $text[1];
+					// Utilisateur désigné
+					if (!empty($singleuser)) {
+						$to[] = $singleuser;
+					}
+					// Mail désigné
+					if (!empty($singlemail)) {
+						$to[] = $singlemail;
+					}
+					if($to) {
+						// Sujet du mail
+						$subject = $this->getData(['module', $this->getUrl(0), 'config', 'subject']);
+						if($subject === '') {
+							$subject = $text[1];
+						}
+						// Envoi le mail
+						$sent = $this->sendMail(
+							$to,
+							$subject,
+							$text[2] . $this->getData(['page', $this->getUrl(0), 'title']) . '" :<br><br>' .
+							$content,
+							$replyTo,
+							$file_name
+						);
 					}
-					// Envoi le mail
-					$sent = $this->sendMail(
-						$to,
-						$subject,
-						$text[2] . $this->getData(['page', $this->getUrl(0), 'title']) . '" :<br><br>' .
-						$content,
-						$replyTo
-					);
 				}
+				// Nettoyage du dossier self::FILE_DIR.uploads
+				$FilesUpload = glob( self::FILE_DIR.'uploads/*'); 
+				foreach($FilesUpload as $file) {   
+					if(is_file($file)) unlink($file); 
+				}
+				// Redirection
+				$redirect = helper::baseUrl() . $this->getUrl(0);
+				if ( $this->getData(['module', $this->getUrl(0), 'config', 'pageId']) !== '') $redirect = helper::baseUrl() . $this->getData(['module', $this->getUrl(0), 'config', 'pageId']);
+				// Effacement des données provisoires
+				$this->setData(['module', $this->getUrl(0), 'draft', '']);
+			} else {
+				$sent = false;	
+				$redirect = helper::baseUrl() . $this->getUrl(0);
 			}
-			// Redirection
-			$redirect = $this->getData(['module', $this->getUrl(0), 'config', 'pageId']);
 			// Passage de la langue d'administration à flatpickr
 			$lang_flatpickr = 'fr';
 			if( $this->getData(['config', 'i18n', 'langAdmin']) ==='en'){
@@ -506,9 +619,9 @@ class form extends common {
 			<?php
 			// Valeurs en sortie
 			$this->addOutput([
-				'notification' => ($sent === true ? $text[3] : $sent),
-				'redirect' => $redirect ? helper::baseUrl() . $redirect : '',
-				'state' => ($sent === true ? true : null),
+				'notification' => ($sent === true ? $text[3] : $notice),
+				'redirect' => $redirect,
+				'state' => ($sent === true ? true : false),
 				'vendor' => [
 					'flatpickr'
 				],
diff --git a/module/form/ressource/.htaccess b/module/form/ressource/.htaccess
new file mode 100644
index 0000000..56c7477
--- /dev/null
+++ b/module/form/ressource/.htaccess
@@ -0,0 +1,4 @@
+# Interdire l'exécution de fichiers
+<FilesMatch "\.(php|phtml|php3|php4|php5|pl|py|jsp|asp|html|htm|shtml|sh|cgi|suspected)$"> 
+deny from all
+</FilesMatch>
diff --git a/module/form/view/config/config.php b/module/form/view/config/config.php
index d676118..1c9d534 100644
--- a/module/form/view/config/config.php
+++ b/module/form/view/config/config.php
@@ -23,7 +23,7 @@ switch ($val) {
 		$text[16] = 'A une adresse email';
 		$text[17] = 'Un email ou une liste de diffusion';
 		$text[18] = 'Répondre à l\'expéditeur depuis le mail de notification';
-		$text[19] = 'Cette option permet de réponse drectement à l\'expéditeur du message si celui-ci a indiqué un email valide.';
+		$text[19] = 'Cette option permet de répondre directement à l\'expéditeur du message si celui-ci a indiqué un email valide.';
 		$text[20] = 'Sélectionner le type de signature';
 		$text[21] = 'Sélectionnez le logo du site';
 		$text[22] = 'Logo';
@@ -35,6 +35,7 @@ switch ($val) {
 		$text[28] = 'Le formulaire ne contient aucun champ.';
 		$text[29] = 'Version n°';
 		$text[30] = 'Enregistrer';
+		$text[31] = 'Taille maximale de la pièce jointe';
 		$types = $module::$types;
 		$signature = $module::$signature;
 		break;
@@ -70,6 +71,7 @@ switch ($val) {
 		$text[28] = 'The form contains no fields';
 		$text[29] = 'Version no.';
 		$text[30] = 'Register';
+		$text[31] = 'Maximum size of the attachment';
 		$types = $module::$types_en;
 		$signature = $module::$signature_en;
 		break;
@@ -242,9 +244,20 @@ switch ($val) {
 						]); ?>
 					</div>
 				</div>
-				<?php echo template::checkbox('formConfigCaptcha', true, $text[26], [
-					'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'captcha'])
-				]); ?>
+				<div class="row">
+					<div class="col6">
+						<?php echo template::checkbox('formConfigCaptcha', true, $text[26], [
+							'checked' => $this->getData(['module', $this->getUrl(0), 'config', 'captcha'])
+						]); ?>
+					</div>
+					<div class="col6">
+						<?php echo template::select('formConfigMaxSize', $module::$maxSizeUpload, [
+							'label' => $text[31],
+							'selected' => $this->getData(['module', $this->getUrl(0), 'config', 'maxSizeUpload'])
+						]); ?>
+					</div>
+				</div>				
+				
 			</div>
 			<div class="block">
 				<h4><?php echo $text[27]; ?></h4>
diff --git a/module/form/view/index/index.css b/module/form/view/index/index.css
new file mode 100644
index 0000000..3dd4a04
--- /dev/null
+++ b/module/form/view/index/index.css
@@ -0,0 +1,39 @@
+/**
+ * This file is part of DeltaCMS.
+ * For full copyright and license information, please see the LICENSE
+ * file that was distributed with this source code.
+ * @author Sylvain Lelièvre <lelievresylvain@free.fr>
+ * @copyright Copyright (C) 2021-2022, Sylvain Lelièvre
+ * @license GNU General Public License, version 3
+ * @link https://deltacms.fr/
+ *
+ * Delta was created from version 11.2.00.24 of ZwiiCMS
+ * @author Rémi Jean <remi.jean@outlook.com>
+ * @copyright Copyright (C) 2008-2018, Rémi Jean
+ * @author Frédéric Tempez <frederic.tempez@outlook.com>
+ * @copyright Copyright (C) 2018-2021, Frédéric Tempez
+ */
+
+
+#formFileReset {
+	background-color: red;
+	border-width:1px;
+	border-color: orange;
+	font-size: 1.15em;
+	font-style: bold;
+	color: yellow; 
+}
+
+#formFileReset:hover {
+	background-color: orange;
+	border-color: orange;
+	font-style: normal;
+	color:black; 
+}
+
+.formInputFile {
+	padding: 9px;
+	border-radius: 2px;
+	border: 1px solid #D8DFE3;
+	backgroung-color: rgba(255,255,255,1);
+}
\ No newline at end of file
diff --git a/module/form/view/index/index.js.php b/module/form/view/index/index.js.php
index 0045a00..b01fc0a 100644
--- a/module/form/view/index/index.js.php
+++ b/module/form/view/index/index.js.php
@@ -15,3 +15,6 @@
  */
 
 
+$( "#formFileReset" ).click(function() {
+	$( "#fileToUpload" ).val('');
+});
diff --git a/module/form/view/index/index.php b/module/form/view/index/index.php
index 1538ee0..7224d79 100644
--- a/module/form/view/index/index.php
+++ b/module/form/view/index/index.php
@@ -14,12 +14,13 @@ switch ($val) {
 }
 ?>
 <?php if($this->getData(['module', $this->getUrl(0), 'input'])): ?>
-	<?php echo template::formOpen('formForm'); ?>
+	<?php echo template::formOpenFile('formForm'); ?>
 		<?php foreach($this->getData(['module', $this->getUrl(0), 'input']) as $index => $input): ?>
 			<?php if($input['type'] === $module::TYPE_MAIL): ?>
 				<?php echo template::mail('formInput[' . $index . ']', [
 					'id' => 'formInput_' . $index,
-					'label' => $input['name']
+					'label' => $input['name'],
+					'value' => $this->getData([ 'module', $this->getUrl(0), 'draft', 'mail'])
 				]); ?>
 			<?php elseif($input['type'] === $module::TYPE_SELECT): ?>
 				<?php
@@ -30,32 +31,44 @@ switch ($val) {
 				?>
 				<?php echo template::select('formInput[' . $index . ']', $values, [
 					'id' => 'formInput_' . $index,
-					'label' => $input['name']
+					'label' => $input['name'],
+					'value' => $this->getData([ 'module', $this->getUrl(0), 'draft', 'select'])
 				]); ?>
 			<?php elseif($input['type'] === $module::TYPE_TEXT): ?>
 				<?php echo template::text('formInput[' . $index . ']', [
 					'id' => 'formInput_' . $index,
-					'label' => $input['name']
+					'label' => $input['name'],
+					'value' => $this->getData([ 'module', $this->getUrl(0), 'draft', 'text'])
 				]); ?>
 			<?php elseif($input['type'] === $module::TYPE_TEXTAREA): ?>
 				<?php echo template::textarea('formInput[' . $index . ']', [
 					'id' => 'formInput_' . $index,
-					'label' => $input['name']
+					'label' => $input['name'],
+					'value' => $this->getData([ 'module', $this->getUrl(0), 'draft', 'textarea'])
 				]); ?>
 			<?php elseif($input['type'] === $module::TYPE_DATETIME): ?>
 				<?php echo template::date('formInput[' . $index . ']', [
 					'id' => 'formInput_' . $index,
 					'label' => $input['name'],
-					'vendor' => 'flatpickr'
+					'vendor' => 'flatpickr',
+					'value' => $this->getData([ 'module', $this->getUrl(0), 'draft', 'datetime'])
 				]); ?>
 			<?php elseif($input['type'] === $module::TYPE_CHECKBOX): ?>
-				<?php echo template::checkbox('formInput[' . $index . ']', true, $input['name']
-				); ?>
+				<?php echo template::checkbox('formInput[' . $index . ']', true, $input['name'], [
+					'checked' => $this->getData([ 'module', $this->getUrl(0), 'draft', 'checkbox'])
+				]); ?>	
+			
+			
+			
+			<?php elseif($input['type'] === $module::TYPE_FILE): ?>	
+				<label class='formLabel'> <?php echo $input['name']; ?> </label>
+				<div class="formInputFile">
+					<input type="hidden" name="MAX_FILE_SIZE" value="5000000">
+					<input type="file" name="fileToUpload" id="fileToUpload"> 
+					<input type="button" id="formFileReset" value="X">
+				</div><br>
 			<?php elseif($input['type'] === $module::TYPE_LABEL): ?>
-				<h3 class='formLabel'>
-					<?php echo $input['name']; ?>
-					<hr class="formLabel">
-				</h3>
+				<p class='formLabel'> <?php echo $input['name']; ?> </p>
 			<?php endif; ?>
 		<?php endforeach; ?>
 		<?php if($this->getData(['module', $this->getUrl(0), 'config', 'captcha'])): ?>
diff --git a/module/gallery/gallery.php b/module/gallery/gallery.php
index e672ee0..ec0c812 100644
--- a/module/gallery/gallery.php
+++ b/module/gallery/gallery.php
@@ -675,7 +675,7 @@ class gallery extends common {
 				// Tri des images
 				switch ($this->getData(['module', $this->getUrl(0), 'content', $this->getUrl(2), 'config', 'sort'])) {
 					case self::SORT_HAND:
-						$positions = $this->getdata(['module',$this->getUrl(0), $this->getUrl(2),'positions']);
+						$positions = $this->getdata(['module',$this->getUrl(0),'content', $this->getUrl(2),'positions']);
 						if ($positions) {
 							foreach ($positions as $key => $value) {
 								if (array_key_exists($key,self::$pictures)) {
diff --git a/module/gallery/view/edit/edit.js.php b/module/gallery/view/edit/edit.js.php
index 3cba9ec..9b411ba 100644
--- a/module/gallery/view/edit/edit.js.php
+++ b/module/gallery/view/edit/edit.js.php
@@ -68,11 +68,7 @@ $( document ).ready(function() {
 	$("#galleryTable").tableDnD({		
 		onDrop: function(table, row) {
 			$("#galleryEditFormResponse").val($.tableDnD.serialize());
-		},
-		onDragStop : function(table, row) {		
-			// Sauvegarde le tri
 			sortPictures();
-			$("#galleryEditFormResponse").val("");
 		},
 		serializeRegexp:  ""
 	});
diff --git a/module/statislite/include/stat.php b/module/statislite/include/stat.php
index 1f0047f..43dc7cd 100644
--- a/module/statislite/include/stat.php
+++ b/module/statislite/include/stat.php
@@ -146,7 +146,9 @@ if( file_exists($fichiers_json.'filtre_primaire.json')){
 		
 		//Initialisation si c'est un nouvel indice
 		if(!isset($log[$indice])){
-			$log[$indice] = array('ip' => $ip, 'user_id'=> $delta_user_id, 'userAgent' => $_SERVER['HTTP_USER_AGENT'], 'langage' => $_SERVER['HTTP_ACCEPT_LANGUAGE'], 'referer' => $_SERVER['HTTP_REFERER'], 'vues' => array(), 'client' => array() );
+			$referer = '';
+			if( isset( $_SERVER['HTTP_REFERER'] )) $referer = $_SERVER['HTTP_REFERER'];
+			$log[$indice] = array('ip' => $ip, 'user_id'=> $delta_user_id, 'userAgent' => $_SERVER['HTTP_USER_AGENT'], 'langage' => $_SERVER['HTTP_ACCEPT_LANGUAGE'], 'referer' => $referer, 'vues' => array(), 'client' => array() );
 		}
 		// Ajout de la vue sous la forme date et page vue
 		$indice2 = count($log[$indice]['vues']);
diff --git a/module/statislite/statislite.php b/module/statislite/statislite.php
index ef88a2d..53dc13e 100644
--- a/module/statislite/statislite.php
+++ b/module/statislite/statislite.php
@@ -605,12 +605,12 @@ class statislite extends common {
 			// Sauvegarde de sécurité des fichiers json
 			$this->sauvegardeJson();
 			// Réinitialisation des fichiers json
-				$this -> initcumul();
-				$this -> initchrono();
-				file_put_contents( self::$fichiers_json.'robots.json', '{}');
-				file_put_contents( self::$fichiers_json.'sessionInvalide.json', '{}');
-				file_put_contents( self::$fichiers_json.'affitampon.json', '{}');
-				file_put_contents( self::$fichiers_json.'sessionLog.json', '{}');
+			$this -> initcumul();
+			$this -> initchrono();
+			file_put_contents( self::$fichiers_json.'robots.json', '{}');
+			file_put_contents( self::$fichiers_json.'sessionInvalide.json', '{}');
+			file_put_contents( self::$fichiers_json.'affitampon.json', '{}');
+			file_put_contents( self::$fichiers_json.'sessionLog.json', '{}');
 			// Valeurs en sortie
 			$this->addOutput([
 				'redirect' => helper::baseUrl() . $this->getUrl(0) . '/config',
@@ -846,7 +846,9 @@ class statislite extends common {
 					$log[$numSession]['vues'] = $tableau[$numSession]['vues'];
 					$nbpageparsession = count($log[$numSession]['vues']);
 				}
-				$ip = $log[$numSession]['ip'];
+				if(isset($log[$numSession]['ip'])){
+					$ip = $log[$numSession]['ip'];
+				}
 				$datetimei = strtotime(substr($log[$numSession]['vues'][0], 0 , 19));
 				// Si $nbpageparsession <=1 on force la valeur de $datetimef
 				if($nbpageparsession <= 1){ 
@@ -884,10 +886,10 @@ class statislite extends common {
 						$log[$numSession]['client'][2] = $this->systeme($log[$numSession]['userAgent']);
 						// Geolocalisation si elle n'a pas été faite et si l'IP n'est pas déjà détruite
 						if(isset($log[$numSession]['ip'])){
-							if($geolocalisation && ! isset($log[$numSession]['geolocalisation'])){
+							/*if($geolocalisation && ! isset($log[$numSession]['geolocalisation'])){
 								$geo = $this->geolocalise($log[$numSession]['ip']);
 								$log[$numSession]['geolocalisation'] = $geo['country_name'].' - '.$geo['city'];
-							}
+							}*/
 							// CNIL : ne pas mémoriser d'adresse IP
 							unset($log[$numSession]['ip']);
 						}
@@ -998,8 +1000,10 @@ class statislite extends common {
 							$nom = substr($value, 22 , strlen($value)); 
 							//$date = strtotime(substr($value, 0 , 19)); ajouter dans le if && ( strtotime(substr($tab[$numSession]['vues'][$i], 0 , 19)) - $date) < 60)
 							for($i=$key + 1 ; $i < $nbpageparsession; $i++){
-								if( substr($tab[$numSession]['vues'][$i], 22 , strlen($tab[$numSession]['vues'][$i])) == $nom){
-									unset($tab[$numSession]['vues'][$i]);
+								if( isset ($tab[$numSession]['vues'][$i])){
+									if( substr($tab[$numSession]['vues'][$i], 22 , strlen($tab[$numSession]['vues'][$i])) == $nom){
+										unset($tab[$numSession]['vues'][$i]);
+									}
 								}
 							}
 						}
@@ -1063,7 +1067,7 @@ class statislite extends common {
 					}
 					
 					// Geolocalisation
-					if($log[$numSession]['geolocalisation'] != 'Fichier  - clef_ipapi_com.txt  - absent , .'){
+					/*if($log[$numSession]['geolocalisation'] != 'Fichier  - clef_ipapi_com.txt  - absent , .'){
 						// Extraction du pays
 						$postiret = strpos($log[$numSession]['geolocalisation'], '-');
 						$pays = substr($log[$numSession]['geolocalisation'], 0, $postiret - 1);
@@ -1080,6 +1084,7 @@ class statislite extends common {
 							$cumul['clients']['localisation'][$pays] = 1;
 						}
 					}
+					*/
 					
 					// Mise à jour des variables liées au fichier sessionLog.json
 					self::$comptepages = self::$comptepages - $nbpageparsession;
@@ -1311,9 +1316,11 @@ class statislite extends common {
 			}
 			$tampon = $tableau;
 			$nbsessiontampon = count($tampon);
-			for($i=0; $i < $nbEnregSession; $i++){
-				self::$affidetaille[$i] = $tampon[$nbsessiontampon - 1 - $i];
-				if($nbsessiontampon - 1 - $i == 0){ break;}
+			if( $nbsessiontampon > 0 ){
+				for($i=0; $i < $nbEnregSession; $i++){
+					self::$affidetaille[$i] = $tampon[$nbsessiontampon - 1 - $i];
+					if($nbsessiontampon - 1 - $i === 0) break;
+				}
 			}
 		
 			// Valeurs en sortie
@@ -1402,7 +1409,7 @@ class statislite extends common {
 
 	/* Geolocalisation */
 	/* Utilisation de cette fonction supprimée */
-	private function geolocalise($ip){
+	/*private function geolocalise($ip){
 		// Géolocalisation avec le site www.ipapi.com qui offre 10000 requêtes / mois
 		if( is_file(self::$base.'clef_ipapi_com.txt')){
 			$access_key = file_get_contents(self::$base.'clef_ipapi_com.txt');
@@ -1420,6 +1427,7 @@ class statislite extends common {
 		}
 		return $api_result;
 	}
+	*/
 	
 	/* Initialisation de cumul.json */
 	private function initcumul(){