Dolibarr / dolibarr

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php

Indentation +142 added lines, -142 removed lines

@@ -19,146 +19,146 @@
  */
 class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder
 {
-    /**
-     * The name of this encoding scheme (probably 7bit or 8bit).
-     *
-     * @var string
-     */
-    private $name;
-
-    /**
-     * True if canonical transformations should be done.
-     *
-     * @var bool
-     */
-    private $canonical;
-
-    /**
-     * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
-     *
-     * @param string $name
-     * @param bool   $canonical if canonicalization transformation should be done
-     */
-    public function __construct($name, $canonical = false)
-    {
-        $this->name = $name;
-        $this->canonical = $canonical;
-    }
-
-    /**
-     * Encode a given string to produce an encoded string.
-     *
-     * @param string $string
-     * @param int    $firstLineOffset ignored
-     * @param int    $maxLineLength   - 0 means no wrapping will occur
-     *
-     * @return string
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        if ($this->canonical) {
-            $string = $this->canonicalize($string);
-        }
-
-        return $this->safeWordwrap($string, $maxLineLength, "\r\n");
-    }
-
-    /**
-     * Encode stream $in to stream $out.
-     *
-     * @param int $firstLineOffset ignored
-     * @param int $maxLineLength   optional, 0 means no wrapping will occur
-     */
-    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        $leftOver = '';
-        while (false !== $bytes = $os->read(8192)) {
-            $toencode = $leftOver.$bytes;
-            if ($this->canonical) {
-                $toencode = $this->canonicalize($toencode);
-            }
-            $wrapped = $this->safeWordwrap($toencode, $maxLineLength, "\r\n");
-            $lastLinePos = strrpos($wrapped, "\r\n");
-            $leftOver = substr($wrapped, $lastLinePos);
-            $wrapped = substr($wrapped, 0, $lastLinePos);
-
-            $is->write($wrapped);
-        }
-        if (\strlen($leftOver)) {
-            $is->write($leftOver);
-        }
-    }
-
-    /**
-     * Get the name of this encoding scheme.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Not used.
-     */
-    public function charsetChanged($charset)
-    {
-    }
-
-    /**
-     * A safer (but weaker) wordwrap for unicode.
-     *
-     * @param string $string
-     * @param int    $length
-     * @param string $le
-     *
-     * @return string
-     */
-    private function safeWordwrap($string, $length = 75, $le = "\r\n")
-    {
-        if (0 >= $length) {
-            return $string;
-        }
-
-        $originalLines = explode($le, $string);
-
-        $lines = [];
-        $lineCount = 0;
-
-        foreach ($originalLines as $originalLine) {
-            $lines[] = '';
-            $currentLine = &$lines[$lineCount++];
-
-            //$chunks = preg_split('/(?<=[\ \t,\.!\?\-&\+\/])/', $originalLine);
-            $chunks = preg_split('/(?<=\s)/', $originalLine);
-
-            foreach ($chunks as $chunk) {
-                if (0 != \strlen($currentLine)
-                    && \strlen($currentLine.$chunk) > $length) {
-                    $lines[] = '';
-                    $currentLine = &$lines[$lineCount++];
-                }
-                $currentLine .= $chunk;
-            }
-        }
-
-        return implode("\r\n", $lines);
-    }
-
-    /**
-     * Canonicalize string input (fix CRLF).
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    private function canonicalize($string)
-    {
-        return str_replace(
-            ["\r\n", "\r", "\n"],
-            ["\n", "\n", "\r\n"],
-            $string
-            );
-    }
+	/**
+	 * The name of this encoding scheme (probably 7bit or 8bit).
+	 *
+	 * @var string
+	 */
+	private $name;
+
+	/**
+	 * True if canonical transformations should be done.
+	 *
+	 * @var bool
+	 */
+	private $canonical;
+
+	/**
+	 * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
+	 *
+	 * @param string $name
+	 * @param bool   $canonical if canonicalization transformation should be done
+	 */
+	public function __construct($name, $canonical = false)
+	{
+		$this->name = $name;
+		$this->canonical = $canonical;
+	}
+
+	/**
+	 * Encode a given string to produce an encoded string.
+	 *
+	 * @param string $string
+	 * @param int    $firstLineOffset ignored
+	 * @param int    $maxLineLength   - 0 means no wrapping will occur
+	 *
+	 * @return string
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		if ($this->canonical) {
+			$string = $this->canonicalize($string);
+		}
+
+		return $this->safeWordwrap($string, $maxLineLength, "\r\n");
+	}
+
+	/**
+	 * Encode stream $in to stream $out.
+	 *
+	 * @param int $firstLineOffset ignored
+	 * @param int $maxLineLength   optional, 0 means no wrapping will occur
+	 */
+	public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		$leftOver = '';
+		while (false !== $bytes = $os->read(8192)) {
+			$toencode = $leftOver.$bytes;
+			if ($this->canonical) {
+				$toencode = $this->canonicalize($toencode);
+			}
+			$wrapped = $this->safeWordwrap($toencode, $maxLineLength, "\r\n");
+			$lastLinePos = strrpos($wrapped, "\r\n");
+			$leftOver = substr($wrapped, $lastLinePos);
+			$wrapped = substr($wrapped, 0, $lastLinePos);
+
+			$is->write($wrapped);
+		}
+		if (\strlen($leftOver)) {
+			$is->write($leftOver);
+		}
+	}
+
+	/**
+	 * Get the name of this encoding scheme.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Not used.
+	 */
+	public function charsetChanged($charset)
+	{
+	}
+
+	/**
+	 * A safer (but weaker) wordwrap for unicode.
+	 *
+	 * @param string $string
+	 * @param int    $length
+	 * @param string $le
+	 *
+	 * @return string
+	 */
+	private function safeWordwrap($string, $length = 75, $le = "\r\n")
+	{
+		if (0 >= $length) {
+			return $string;
+		}
+
+		$originalLines = explode($le, $string);
+
+		$lines = [];
+		$lineCount = 0;
+
+		foreach ($originalLines as $originalLine) {
+			$lines[] = '';
+			$currentLine = &$lines[$lineCount++];
+
+			//$chunks = preg_split('/(?<=[\ \t,\.!\?\-&\+\/])/', $originalLine);
+			$chunks = preg_split('/(?<=\s)/', $originalLine);
+
+			foreach ($chunks as $chunk) {
+				if (0 != \strlen($currentLine)
+					&& \strlen($currentLine.$chunk) > $length) {
+					$lines[] = '';
+					$currentLine = &$lines[$lineCount++];
+				}
+				$currentLine .= $chunk;
+			}
+		}
+
+		return implode("\r\n", $lines);
+	}
+
+	/**
+	 * Canonicalize string input (fix CRLF).
+	 *
+	 * @param string $string
+	 *
+	 * @return string
+	 */
+	private function canonicalize($string)
+	{
+		return str_replace(
+			["\r\n", "\r", "\n"],
+			["\n", "\n", "\r\n"],
+			$string
+			);
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php

Indentation +116 added lines, -116 removed lines

@@ -15,120 +15,120 @@
  */
 class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_ContentEncoder
 {
-    protected $dotEscape;
-
-    /**
-     * Creates a new QpContentEncoder for the given CharacterStream.
-     *
-     * @param Swift_CharacterStream $charStream to use for reading characters
-     * @param Swift_StreamFilter    $filter     if canonicalization should occur
-     * @param bool                  $dotEscape  if dot stuffing workaround must be enabled
-     */
-    public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null, $dotEscape = false)
-    {
-        $this->dotEscape = $dotEscape;
-        parent::__construct($charStream, $filter);
-    }
-
-    public function __sleep()
-    {
-        return ['charStream', 'filter', 'dotEscape'];
-    }
-
-    protected function getSafeMapShareId()
-    {
-        return static::class.($this->dotEscape ? '.dotEscape' : '');
-    }
-
-    protected function initSafeMap()
-    {
-        parent::initSafeMap();
-        if ($this->dotEscape) {
-            /* Encode . as =2e for buggy remote servers */
-            unset($this->safeMap[0x2e]);
-        }
-    }
-
-    /**
-     * Encode stream $in to stream $out.
-     *
-     * QP encoded strings have a maximum line length of 76 characters.
-     * If the first line needs to be shorter, indicate the difference with
-     * $firstLineOffset.
-     *
-     * @param Swift_OutputByteStream $os              output stream
-     * @param Swift_InputByteStream  $is              input stream
-     * @param int                    $firstLineOffset
-     * @param int                    $maxLineLength
-     */
-    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        if ($maxLineLength > 76 || $maxLineLength <= 0) {
-            $maxLineLength = 76;
-        }
-
-        $thisLineLength = $maxLineLength - $firstLineOffset;
-
-        $this->charStream->flushContents();
-        $this->charStream->importByteStream($os);
-
-        $currentLine = '';
-        $prepend = '';
-        $size = $lineLen = 0;
-
-        while (false !== $bytes = $this->nextSequence()) {
-            // If we're filtering the input
-            if (isset($this->filter)) {
-                // If we can't filter because we need more bytes
-                while ($this->filter->shouldBuffer($bytes)) {
-                    // Then collect bytes into the buffer
-                    if (false === $moreBytes = $this->nextSequence(1)) {
-                        break;
-                    }
-
-                    foreach ($moreBytes as $b) {
-                        $bytes[] = $b;
-                    }
-                }
-                // And filter them
-                $bytes = $this->filter->filter($bytes);
-            }
-
-            $enc = $this->encodeByteSequence($bytes, $size);
-
-            $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + (false === $i ? $size : $i);
-
-            if ($currentLine && $newLineLength >= $thisLineLength) {
-                $is->write($prepend.$this->standardize($currentLine));
-                $currentLine = '';
-                $prepend = "=\r\n";
-                $thisLineLength = $maxLineLength;
-                $lineLen = 0;
-            }
-
-            $currentLine .= $enc;
-
-            if (false === $i) {
-                $lineLen += $size;
-            } else {
-                // 6 is the length of '=0D=0A'.
-                $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
-            }
-        }
-        if (\strlen($currentLine)) {
-            $is->write($prepend.$this->standardize($currentLine));
-        }
-    }
-
-    /**
-     * Get the name of this encoding scheme.
-     * Returns the string 'quoted-printable'.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'quoted-printable';
-    }
+	protected $dotEscape;
+
+	/**
+	 * Creates a new QpContentEncoder for the given CharacterStream.
+	 *
+	 * @param Swift_CharacterStream $charStream to use for reading characters
+	 * @param Swift_StreamFilter    $filter     if canonicalization should occur
+	 * @param bool                  $dotEscape  if dot stuffing workaround must be enabled
+	 */
+	public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null, $dotEscape = false)
+	{
+		$this->dotEscape = $dotEscape;
+		parent::__construct($charStream, $filter);
+	}
+
+	public function __sleep()
+	{
+		return ['charStream', 'filter', 'dotEscape'];
+	}
+
+	protected function getSafeMapShareId()
+	{
+		return static::class.($this->dotEscape ? '.dotEscape' : '');
+	}
+
+	protected function initSafeMap()
+	{
+		parent::initSafeMap();
+		if ($this->dotEscape) {
+			/* Encode . as =2e for buggy remote servers */
+			unset($this->safeMap[0x2e]);
+		}
+	}
+
+	/**
+	 * Encode stream $in to stream $out.
+	 *
+	 * QP encoded strings have a maximum line length of 76 characters.
+	 * If the first line needs to be shorter, indicate the difference with
+	 * $firstLineOffset.
+	 *
+	 * @param Swift_OutputByteStream $os              output stream
+	 * @param Swift_InputByteStream  $is              input stream
+	 * @param int                    $firstLineOffset
+	 * @param int                    $maxLineLength
+	 */
+	public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		if ($maxLineLength > 76 || $maxLineLength <= 0) {
+			$maxLineLength = 76;
+		}
+
+		$thisLineLength = $maxLineLength - $firstLineOffset;
+
+		$this->charStream->flushContents();
+		$this->charStream->importByteStream($os);
+
+		$currentLine = '';
+		$prepend = '';
+		$size = $lineLen = 0;
+
+		while (false !== $bytes = $this->nextSequence()) {
+			// If we're filtering the input
+			if (isset($this->filter)) {
+				// If we can't filter because we need more bytes
+				while ($this->filter->shouldBuffer($bytes)) {
+					// Then collect bytes into the buffer
+					if (false === $moreBytes = $this->nextSequence(1)) {
+						break;
+					}
+
+					foreach ($moreBytes as $b) {
+						$bytes[] = $b;
+					}
+				}
+				// And filter them
+				$bytes = $this->filter->filter($bytes);
+			}
+
+			$enc = $this->encodeByteSequence($bytes, $size);
+
+			$i = strpos($enc, '=0D=0A');
+			$newLineLength = $lineLen + (false === $i ? $size : $i);
+
+			if ($currentLine && $newLineLength >= $thisLineLength) {
+				$is->write($prepend.$this->standardize($currentLine));
+				$currentLine = '';
+				$prepend = "=\r\n";
+				$thisLineLength = $maxLineLength;
+				$lineLen = 0;
+			}
+
+			$currentLine .= $enc;
+
+			if (false === $i) {
+				$lineLen += $size;
+			} else {
+				// 6 is the length of '=0D=0A'.
+				$lineLen = $size - strrpos($enc, '=0D=0A') - 6;
+			}
+		}
+		if (\strlen($currentLine)) {
+			$is->write($prepend.$this->standardize($currentLine));
+		}
+	}
+
+	/**
+	 * Get the name of this encoding scheme.
+	 * Returns the string 'quoted-printable'.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'quoted-printable';
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php

Indentation +55 added lines, -55 removed lines

@@ -16,64 +16,64 @@
  */
 class Swift_Mime_ContentEncoder_NullContentEncoder implements Swift_Mime_ContentEncoder
 {
-    /**
-     * The name of this encoding scheme (probably 7bit or 8bit).
-     *
-     * @var string
-     */
-    private $name;
+	/**
+	 * The name of this encoding scheme (probably 7bit or 8bit).
+	 *
+	 * @var string
+	 */
+	private $name;
 
-    /**
-     * Creates a new NullContentEncoder with $name (probably 7bit or 8bit).
-     *
-     * @param string $name
-     */
-    public function __construct($name)
-    {
-        $this->name = $name;
-    }
+	/**
+	 * Creates a new NullContentEncoder with $name (probably 7bit or 8bit).
+	 *
+	 * @param string $name
+	 */
+	public function __construct($name)
+	{
+		$this->name = $name;
+	}
 
-    /**
-     * Encode a given string to produce an encoded string.
-     *
-     * @param string $string
-     * @param int    $firstLineOffset ignored
-     * @param int    $maxLineLength   ignored
-     *
-     * @return string
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        return $string;
-    }
+	/**
+	 * Encode a given string to produce an encoded string.
+	 *
+	 * @param string $string
+	 * @param int    $firstLineOffset ignored
+	 * @param int    $maxLineLength   ignored
+	 *
+	 * @return string
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		return $string;
+	}
 
-    /**
-     * Encode stream $in to stream $out.
-     *
-     * @param int $firstLineOffset ignored
-     * @param int $maxLineLength   ignored
-     */
-    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        while (false !== ($bytes = $os->read(8192))) {
-            $is->write($bytes);
-        }
-    }
+	/**
+	 * Encode stream $in to stream $out.
+	 *
+	 * @param int $firstLineOffset ignored
+	 * @param int $maxLineLength   ignored
+	 */
+	public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		while (false !== ($bytes = $os->read(8192))) {
+			$is->write($bytes);
+		}
+	}
 
-    /**
-     * Get the name of this encoding scheme.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return $this->name;
-    }
+	/**
+	 * Get the name of this encoding scheme.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return $this->name;
+	}
 
-    /**
-     * Not used.
-     */
-    public function charsetChanged($charset)
-    {
-    }
+	/**
+	 * Not used.
+	 */
+	public function charsetChanged($charset)
+	{
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php

Indentation +91 added lines, -91 removed lines

@@ -15,107 +15,107 @@
  */
 class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_ContentEncoder
 {
-    /**
-     * @var string|null
-     */
-    private $charset;
+	/**
+	 * @var string|null
+	 */
+	private $charset;
 
-    /**
-     * @param string|null $charset
-     */
-    public function __construct($charset = null)
-    {
-        $this->charset = $charset ?: 'utf-8';
-    }
+	/**
+	 * @param string|null $charset
+	 */
+	public function __construct($charset = null)
+	{
+		$this->charset = $charset ?: 'utf-8';
+	}
 
-    /**
-     * Notify this observer that the entity's charset has changed.
-     *
-     * @param string $charset
-     */
-    public function charsetChanged($charset)
-    {
-        $this->charset = $charset;
-    }
+	/**
+	 * Notify this observer that the entity's charset has changed.
+	 *
+	 * @param string $charset
+	 */
+	public function charsetChanged($charset)
+	{
+		$this->charset = $charset;
+	}
 
-    /**
-     * Encode $in to $out.
-     *
-     * @param Swift_OutputByteStream $os              to read from
-     * @param Swift_InputByteStream  $is              to write to
-     * @param int                    $firstLineOffset
-     * @param int                    $maxLineLength   0 indicates the default length for this encoding
-     *
-     * @throws RuntimeException
-     */
-    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        if ('utf-8' !== $this->charset) {
-            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
-        }
+	/**
+	 * Encode $in to $out.
+	 *
+	 * @param Swift_OutputByteStream $os              to read from
+	 * @param Swift_InputByteStream  $is              to write to
+	 * @param int                    $firstLineOffset
+	 * @param int                    $maxLineLength   0 indicates the default length for this encoding
+	 *
+	 * @throws RuntimeException
+	 */
+	public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		if ('utf-8' !== $this->charset) {
+			throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+		}
 
-        $string = '';
+		$string = '';
 
-        while (false !== $bytes = $os->read(8192)) {
-            $string .= $bytes;
-        }
+		while (false !== $bytes = $os->read(8192)) {
+			$string .= $bytes;
+		}
 
-        $is->write($this->encodeString($string));
-    }
+		$is->write($this->encodeString($string));
+	}
 
-    /**
-     * Get the MIME name of this content encoding scheme.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'quoted-printable';
-    }
+	/**
+	 * Get the MIME name of this content encoding scheme.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'quoted-printable';
+	}
 
-    /**
-     * Encode a given string to produce an encoded string.
-     *
-     * @param string $string
-     * @param int    $firstLineOffset if first line needs to be shorter
-     * @param int    $maxLineLength   0 indicates the default length for this encoding
-     *
-     * @throws RuntimeException
-     *
-     * @return string
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        if ('utf-8' !== $this->charset) {
-            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
-        }
+	/**
+	 * Encode a given string to produce an encoded string.
+	 *
+	 * @param string $string
+	 * @param int    $firstLineOffset if first line needs to be shorter
+	 * @param int    $maxLineLength   0 indicates the default length for this encoding
+	 *
+	 * @throws RuntimeException
+	 *
+	 * @return string
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		if ('utf-8' !== $this->charset) {
+			throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+		}
 
-        return $this->standardize(quoted_printable_encode($string));
-    }
+		return $this->standardize(quoted_printable_encode($string));
+	}
 
-    /**
-     * Make sure CRLF is correct and HT/SPACE are in valid places.
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    protected function standardize($string)
-    {
-        // transform CR or LF to CRLF
-        $string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
-        // transform =0D=0A to CRLF
-        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
+	/**
+	 * Make sure CRLF is correct and HT/SPACE are in valid places.
+	 *
+	 * @param string $string
+	 *
+	 * @return string
+	 */
+	protected function standardize($string)
+	{
+		// transform CR or LF to CRLF
+		$string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
+		// transform =0D=0A to CRLF
+		$string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        switch (\ord(substr($string, -1))) {
-            case 0x09:
-                $string = substr_replace($string, '=09', -1);
-                break;
-            case 0x20:
-                $string = substr_replace($string, '=20', -1);
-                break;
-        }
+		switch (\ord(substr($string, -1))) {
+			case 0x09:
+				$string = substr_replace($string, '=09', -1);
+				break;
+			case 0x20:
+				$string = substr_replace($string, '=20', -1);
+				break;
+		}
 
-        return $string;
-    }
+		return $string;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php

Indentation +67 added lines, -67 removed lines

@@ -17,80 +17,80 @@
  */
 class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_ContentEncoder
 {
-    /**
-     * @var Swift_Mime_ContentEncoder_QpContentEncoder
-     */
-    private $safeEncoder;
+	/**
+	 * @var Swift_Mime_ContentEncoder_QpContentEncoder
+	 */
+	private $safeEncoder;
 
-    /**
-     * @var Swift_Mime_ContentEncoder_NativeQpContentEncoder
-     */
-    private $nativeEncoder;
+	/**
+	 * @var Swift_Mime_ContentEncoder_NativeQpContentEncoder
+	 */
+	private $nativeEncoder;
 
-    /**
-     * @var string|null
-     */
-    private $charset;
+	/**
+	 * @var string|null
+	 */
+	private $charset;
 
-    /**
-     * Constructor.
-     *
-     * @param string|null $charset
-     */
-    public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
-    {
-        $this->safeEncoder = $safeEncoder;
-        $this->nativeEncoder = $nativeEncoder;
-        $this->charset = $charset;
-    }
+	/**
+	 * Constructor.
+	 *
+	 * @param string|null $charset
+	 */
+	public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
+	{
+		$this->safeEncoder = $safeEncoder;
+		$this->nativeEncoder = $nativeEncoder;
+		$this->charset = $charset;
+	}
 
-    /**
-     * Make a deep copy of object.
-     */
-    public function __clone()
-    {
-        $this->safeEncoder = clone $this->safeEncoder;
-        $this->nativeEncoder = clone $this->nativeEncoder;
-    }
+	/**
+	 * Make a deep copy of object.
+	 */
+	public function __clone()
+	{
+		$this->safeEncoder = clone $this->safeEncoder;
+		$this->nativeEncoder = clone $this->nativeEncoder;
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function charsetChanged($charset)
-    {
-        $this->charset = $charset;
-        $this->safeEncoder->charsetChanged($charset);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function charsetChanged($charset)
+	{
+		$this->charset = $charset;
+		$this->safeEncoder->charsetChanged($charset);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        $this->getEncoder()->encodeByteStream($os, $is, $firstLineOffset, $maxLineLength);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		$this->getEncoder()->encodeByteStream($os, $is, $firstLineOffset, $maxLineLength);
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function getName()
-    {
-        return 'quoted-printable';
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function getName()
+	{
+		return 'quoted-printable';
+	}
 
-    /**
-     * {@inheritdoc}
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        return $this->getEncoder()->encodeString($string, $firstLineOffset, $maxLineLength);
-    }
+	/**
+	 * {@inheritdoc}
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		return $this->getEncoder()->encodeString($string, $firstLineOffset, $maxLineLength);
+	}
 
-    /**
-     * @return Swift_Mime_ContentEncoder
-     */
-    private function getEncoder()
-    {
-        return 'utf-8' === $this->charset ? $this->nativeEncoder : $this->safeEncoder;
-    }
+	/**
+	 * @return Swift_Mime_ContentEncoder
+	 */
+	private function getEncoder()
+	{
+		return 'utf-8' === $this->charset ? $this->nativeEncoder : $this->safeEncoder;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php

Indentation +22 added lines, -22 removed lines

@@ -15,27 +15,27 @@
  */
 class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
 {
-    /**
-     * Creates a new Attachment with $headers and $encoder.
-     *
-     * @param array $mimeTypes optional
-     */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
-    {
-        parent::__construct($headers, $encoder, $cache, $idGenerator, $mimeTypes);
-        $this->setDisposition('inline');
-        $this->setId($this->getId());
-    }
+	/**
+	 * Creates a new Attachment with $headers and $encoder.
+	 *
+	 * @param array $mimeTypes optional
+	 */
+	public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
+	{
+		parent::__construct($headers, $encoder, $cache, $idGenerator, $mimeTypes);
+		$this->setDisposition('inline');
+		$this->setId($this->getId());
+	}
 
-    /**
-     * Get the nesting level of this EmbeddedFile.
-     *
-     * Returns {@see LEVEL_RELATED}.
-     *
-     * @return int
-     */
-    public function getNestingLevel()
-    {
-        return self::LEVEL_RELATED;
-    }
+	/**
+	 * Get the nesting level of this EmbeddedFile.
+	 *
+	 * Returns {@see LEVEL_RELATED}.
+	 *
+	 * @return int
+	 */
+	public function getNestingLevel()
+	{
+		return self::LEVEL_RELATED;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php

Indentation +34 added lines, -34 removed lines

@@ -13,42 +13,42 @@
  */
 class Swift_Mime_IdGenerator implements Swift_IdGenerator
 {
-    private $idRight;
+	private $idRight;
 
-    /**
-     * @param string $idRight
-     */
-    public function __construct($idRight)
-    {
-        $this->idRight = $idRight;
-    }
+	/**
+	 * @param string $idRight
+	 */
+	public function __construct($idRight)
+	{
+		$this->idRight = $idRight;
+	}
 
-    /**
-     * Returns the right-hand side of the "@" used in all generated IDs.
-     *
-     * @return string
-     */
-    public function getIdRight()
-    {
-        return $this->idRight;
-    }
+	/**
+	 * Returns the right-hand side of the "@" used in all generated IDs.
+	 *
+	 * @return string
+	 */
+	public function getIdRight()
+	{
+		return $this->idRight;
+	}
 
-    /**
-     * Sets the right-hand side of the "@" to use in all generated IDs.
-     *
-     * @param string $idRight
-     */
-    public function setIdRight($idRight)
-    {
-        $this->idRight = $idRight;
-    }
+	/**
+	 * Sets the right-hand side of the "@" to use in all generated IDs.
+	 *
+	 * @param string $idRight
+	 */
+	public function setIdRight($idRight)
+	{
+		$this->idRight = $idRight;
+	}
 
-    /**
-     * @return string
-     */
-    public function generateId()
-    {
-        // 32 hex values for the left part
-        return bin2hex(random_bytes(16)).'@'.$this->idRight;
-    }
+	/**
+	 * @return string
+	 */
+	public function generateId()
+	{
+		// 32 hex values for the left part
+		return bin2hex(random_bytes(16)).'@'.$this->idRight;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php

Indentation +624 added lines, -624 removed lines

@@ -15,628 +15,628 @@
  */
 class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 {
-    const PRIORITY_HIGHEST = 1;
-    const PRIORITY_HIGH = 2;
-    const PRIORITY_NORMAL = 3;
-    const PRIORITY_LOW = 4;
-    const PRIORITY_LOWEST = 5;
-
-    /**
-     * Create a new SimpleMessage with $headers, $encoder and $cache.
-     *
-     * @param string $charset
-     */
-    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
-    {
-        parent::__construct($headers, $encoder, $cache, $idGenerator, $charset);
-        $this->getHeaders()->defineOrdering([
-            'Return-Path',
-            'Received',
-            'DKIM-Signature',
-            'DomainKey-Signature',
-            'Sender',
-            'Message-ID',
-            'Date',
-            'Subject',
-            'From',
-            'Reply-To',
-            'To',
-            'Cc',
-            'Bcc',
-            'MIME-Version',
-            'Content-Type',
-            'Content-Transfer-Encoding',
-            ]);
-        $this->getHeaders()->setAlwaysDisplayed(['Date', 'Message-ID', 'From']);
-        $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
-        $this->setDate(new DateTimeImmutable());
-        $this->setId($this->getId());
-        $this->getHeaders()->addMailboxHeader('From');
-    }
-
-    /**
-     * Always returns {@link LEVEL_TOP} for a message instance.
-     *
-     * @return int
-     */
-    public function getNestingLevel()
-    {
-        return self::LEVEL_TOP;
-    }
-
-    /**
-     * Set the subject of this message.
-     *
-     * @param string $subject
-     *
-     * @return $this
-     */
-    public function setSubject($subject)
-    {
-        if (!$this->setHeaderFieldModel('Subject', $subject)) {
-            $this->getHeaders()->addTextHeader('Subject', $subject);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the subject of this message.
-     *
-     * @return string
-     */
-    public function getSubject()
-    {
-        return $this->getHeaderFieldModel('Subject');
-    }
-
-    /**
-     * Set the date at which this message was created.
-     *
-     * @return $this
-     */
-    public function setDate(DateTimeInterface $dateTime)
-    {
-        if (!$this->setHeaderFieldModel('Date', $dateTime)) {
-            $this->getHeaders()->addDateHeader('Date', $dateTime);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the date at which this message was created.
-     *
-     * @return DateTimeInterface
-     */
-    public function getDate()
-    {
-        return $this->getHeaderFieldModel('Date');
-    }
-
-    /**
-     * Set the return-path (the bounce address) of this message.
-     *
-     * @param string $address
-     *
-     * @return $this
-     */
-    public function setReturnPath($address)
-    {
-        if (!$this->setHeaderFieldModel('Return-Path', $address)) {
-            $this->getHeaders()->addPathHeader('Return-Path', $address);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the return-path (bounce address) of this message.
-     *
-     * @return string
-     */
-    public function getReturnPath()
-    {
-        return $this->getHeaderFieldModel('Return-Path');
-    }
-
-    /**
-     * Set the sender of this message.
-     *
-     * This does not override the From field, but it has a higher significance.
-     *
-     * @param string $address
-     * @param string $name    optional
-     *
-     * @return $this
-     */
-    public function setSender($address, $name = null)
-    {
-        if (!\is_array($address) && isset($name)) {
-            $address = [$address => $name];
-        }
-
-        if (!$this->setHeaderFieldModel('Sender', (array) $address)) {
-            $this->getHeaders()->addMailboxHeader('Sender', (array) $address);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the sender of this message.
-     *
-     * @return string
-     */
-    public function getSender()
-    {
-        return $this->getHeaderFieldModel('Sender');
-    }
-
-    /**
-     * Add a From: address to this message.
-     *
-     * If $name is passed this name will be associated with the address.
-     *
-     * @param string $address
-     * @param string $name    optional
-     *
-     * @return $this
-     */
-    public function addFrom($address, $name = null)
-    {
-        $current = $this->getFrom();
-        $current[$address] = $name;
-
-        return $this->setFrom($current);
-    }
-
-    /**
-     * Set the from address of this message.
-     *
-     * You may pass an array of addresses if this message is from multiple people.
-     *
-     * If $name is passed and the first parameter is a string, this name will be
-     * associated with the address.
-     *
-     * @param string|array $addresses
-     * @param string       $name      optional
-     *
-     * @return $this
-     */
-    public function setFrom($addresses, $name = null)
-    {
-        if (!\is_array($addresses) && isset($name)) {
-            $addresses = [$addresses => $name];
-        }
-
-        if (!$this->setHeaderFieldModel('From', (array) $addresses)) {
-            $this->getHeaders()->addMailboxHeader('From', (array) $addresses);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the from address of this message.
-     *
-     * @return mixed
-     */
-    public function getFrom()
-    {
-        return $this->getHeaderFieldModel('From');
-    }
-
-    /**
-     * Add a Reply-To: address to this message.
-     *
-     * If $name is passed this name will be associated with the address.
-     *
-     * @param string $address
-     * @param string $name    optional
-     *
-     * @return $this
-     */
-    public function addReplyTo($address, $name = null)
-    {
-        $current = $this->getReplyTo();
-        $current[$address] = $name;
-
-        return $this->setReplyTo($current);
-    }
-
-    /**
-     * Set the reply-to address of this message.
-     *
-     * You may pass an array of addresses if replies will go to multiple people.
-     *
-     * If $name is passed and the first parameter is a string, this name will be
-     * associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     *
-     * @return $this
-     */
-    public function setReplyTo($addresses, $name = null)
-    {
-        if (!\is_array($addresses) && isset($name)) {
-            $addresses = [$addresses => $name];
-        }
-
-        if (!$this->setHeaderFieldModel('Reply-To', (array) $addresses)) {
-            $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the reply-to address of this message.
-     *
-     * @return string
-     */
-    public function getReplyTo()
-    {
-        return $this->getHeaderFieldModel('Reply-To');
-    }
-
-    /**
-     * Add a To: address to this message.
-     *
-     * If $name is passed this name will be associated with the address.
-     *
-     * @param string $address
-     * @param string $name    optional
-     *
-     * @return $this
-     */
-    public function addTo($address, $name = null)
-    {
-        $current = $this->getTo();
-        $current[$address] = $name;
-
-        return $this->setTo($current);
-    }
-
-    /**
-     * Set the to addresses of this message.
-     *
-     * If multiple recipients will receive the message an array should be used.
-     * Example: array('receiver@domain.org', 'other@domain.org' => 'A name')
-     *
-     * If $name is passed and the first parameter is a string, this name will be
-     * associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     *
-     * @return $this
-     */
-    public function setTo($addresses, $name = null)
-    {
-        if (!\is_array($addresses) && isset($name)) {
-            $addresses = [$addresses => $name];
-        }
-
-        if (!$this->setHeaderFieldModel('To', (array) $addresses)) {
-            $this->getHeaders()->addMailboxHeader('To', (array) $addresses);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the To addresses of this message.
-     *
-     * @return array
-     */
-    public function getTo()
-    {
-        return $this->getHeaderFieldModel('To');
-    }
-
-    /**
-     * Add a Cc: address to this message.
-     *
-     * If $name is passed this name will be associated with the address.
-     *
-     * @param string $address
-     * @param string $name    optional
-     *
-     * @return $this
-     */
-    public function addCc($address, $name = null)
-    {
-        $current = $this->getCc();
-        $current[$address] = $name;
-
-        return $this->setCc($current);
-    }
-
-    /**
-     * Set the Cc addresses of this message.
-     *
-     * If $name is passed and the first parameter is a string, this name will be
-     * associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     *
-     * @return $this
-     */
-    public function setCc($addresses, $name = null)
-    {
-        if (!\is_array($addresses) && isset($name)) {
-            $addresses = [$addresses => $name];
-        }
-
-        if (!$this->setHeaderFieldModel('Cc', (array) $addresses)) {
-            $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the Cc address of this message.
-     *
-     * @return array
-     */
-    public function getCc()
-    {
-        return $this->getHeaderFieldModel('Cc');
-    }
-
-    /**
-     * Add a Bcc: address to this message.
-     *
-     * If $name is passed this name will be associated with the address.
-     *
-     * @param string $address
-     * @param string $name    optional
-     *
-     * @return $this
-     */
-    public function addBcc($address, $name = null)
-    {
-        $current = $this->getBcc();
-        $current[$address] = $name;
-
-        return $this->setBcc($current);
-    }
-
-    /**
-     * Set the Bcc addresses of this message.
-     *
-     * If $name is passed and the first parameter is a string, this name will be
-     * associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     *
-     * @return $this
-     */
-    public function setBcc($addresses, $name = null)
-    {
-        if (!\is_array($addresses) && isset($name)) {
-            $addresses = [$addresses => $name];
-        }
-
-        if (!$this->setHeaderFieldModel('Bcc', (array) $addresses)) {
-            $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the Bcc addresses of this message.
-     *
-     * @return array
-     */
-    public function getBcc()
-    {
-        return $this->getHeaderFieldModel('Bcc');
-    }
-
-    /**
-     * Set the priority of this message.
-     *
-     * The value is an integer where 1 is the highest priority and 5 is the lowest.
-     *
-     * @param int $priority
-     *
-     * @return $this
-     */
-    public function setPriority($priority)
-    {
-        $priorityMap = [
-            self::PRIORITY_HIGHEST => 'Highest',
-            self::PRIORITY_HIGH => 'High',
-            self::PRIORITY_NORMAL => 'Normal',
-            self::PRIORITY_LOW => 'Low',
-            self::PRIORITY_LOWEST => 'Lowest',
-            ];
-        $pMapKeys = array_keys($priorityMap);
-        if ($priority > max($pMapKeys)) {
-            $priority = max($pMapKeys);
-        } elseif ($priority < min($pMapKeys)) {
-            $priority = min($pMapKeys);
-        }
-        if (!$this->setHeaderFieldModel('X-Priority',
-            sprintf('%d (%s)', $priority, $priorityMap[$priority]))) {
-            $this->getHeaders()->addTextHeader('X-Priority',
-                sprintf('%d (%s)', $priority, $priorityMap[$priority]));
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the priority of this message.
-     *
-     * The returned value is an integer where 1 is the highest priority and 5
-     * is the lowest.
-     *
-     * @return int
-     */
-    public function getPriority()
-    {
-        list($priority) = sscanf($this->getHeaderFieldModel('X-Priority'),
-            '%[1-5]'
-            );
-
-        return $priority ?? 3;
-    }
-
-    /**
-     * Ask for a delivery receipt from the recipient to be sent to $addresses.
-     *
-     * @param array $addresses
-     *
-     * @return $this
-     */
-    public function setReadReceiptTo($addresses)
-    {
-        if (!$this->setHeaderFieldModel('Disposition-Notification-To', $addresses)) {
-            $this->getHeaders()
-                ->addMailboxHeader('Disposition-Notification-To', $addresses);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Get the addresses to which a read-receipt will be sent.
-     *
-     * @return string
-     */
-    public function getReadReceiptTo()
-    {
-        return $this->getHeaderFieldModel('Disposition-Notification-To');
-    }
-
-    /**
-     * Attach a {@link Swift_Mime_SimpleMimeEntity} such as an Attachment or MimePart.
-     *
-     * @return $this
-     */
-    public function attach(Swift_Mime_SimpleMimeEntity $entity)
-    {
-        $this->setChildren(array_merge($this->getChildren(), [$entity]));
-
-        return $this;
-    }
-
-    /**
-     * Remove an already attached entity.
-     *
-     * @return $this
-     */
-    public function detach(Swift_Mime_SimpleMimeEntity $entity)
-    {
-        $newChildren = [];
-        foreach ($this->getChildren() as $child) {
-            if ($entity !== $child) {
-                $newChildren[] = $child;
-            }
-        }
-        $this->setChildren($newChildren);
-
-        return $this;
-    }
-
-    /**
-     * Attach a {@link Swift_Mime_SimpleMimeEntity} and return it's CID source.
-     *
-     * This method should be used when embedding images or other data in a message.
-     *
-     * @return string
-     */
-    public function embed(Swift_Mime_SimpleMimeEntity $entity)
-    {
-        $this->attach($entity);
-
-        return 'cid:'.$entity->getId();
-    }
-
-    /**
-     * Get this message as a complete string.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
-            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
-            $string = parent::toString();
-            $this->setChildren($children);
-        } else {
-            $string = parent::toString();
-        }
-
-        return $string;
-    }
-
-    /**
-     * Returns a string representation of this object.
-     *
-     * @see toString()
-     *
-     * @return string
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Write this message to a {@link Swift_InputByteStream}.
-     */
-    public function toByteStream(Swift_InputByteStream $is)
-    {
-        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
-            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
-            parent::toByteStream($is);
-            $this->setChildren($children);
-        } else {
-            parent::toByteStream($is);
-        }
-    }
-
-    /** @see Swift_Mime_SimpleMimeEntity::getIdField() */
-    protected function getIdField()
-    {
-        return 'Message-ID';
-    }
-
-    /** Turn the body of this message into a child of itself if needed */
-    protected function becomeMimePart()
-    {
-        $part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
-            $this->getCache(), $this->getIdGenerator(), $this->userCharset
-            );
-        $part->setContentType($this->userContentType);
-        $part->setBody($this->getBody());
-        $part->setFormat($this->userFormat);
-        $part->setDelSp($this->userDelSp);
-        $part->setNestingLevel($this->getTopNestingLevel());
-
-        return $part;
-    }
-
-    /** Get the highest nesting level nested inside this message */
-    private function getTopNestingLevel()
-    {
-        $highestLevel = $this->getNestingLevel();
-        foreach ($this->getChildren() as $child) {
-            $childLevel = $child->getNestingLevel();
-            if ($highestLevel < $childLevel) {
-                $highestLevel = $childLevel;
-            }
-        }
-
-        return $highestLevel;
-    }
+	const PRIORITY_HIGHEST = 1;
+	const PRIORITY_HIGH = 2;
+	const PRIORITY_NORMAL = 3;
+	const PRIORITY_LOW = 4;
+	const PRIORITY_LOWEST = 5;
+
+	/**
+	 * Create a new SimpleMessage with $headers, $encoder and $cache.
+	 *
+	 * @param string $charset
+	 */
+	public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
+	{
+		parent::__construct($headers, $encoder, $cache, $idGenerator, $charset);
+		$this->getHeaders()->defineOrdering([
+			'Return-Path',
+			'Received',
+			'DKIM-Signature',
+			'DomainKey-Signature',
+			'Sender',
+			'Message-ID',
+			'Date',
+			'Subject',
+			'From',
+			'Reply-To',
+			'To',
+			'Cc',
+			'Bcc',
+			'MIME-Version',
+			'Content-Type',
+			'Content-Transfer-Encoding',
+			]);
+		$this->getHeaders()->setAlwaysDisplayed(['Date', 'Message-ID', 'From']);
+		$this->getHeaders()->addTextHeader('MIME-Version', '1.0');
+		$this->setDate(new DateTimeImmutable());
+		$this->setId($this->getId());
+		$this->getHeaders()->addMailboxHeader('From');
+	}
+
+	/**
+	 * Always returns {@link LEVEL_TOP} for a message instance.
+	 *
+	 * @return int
+	 */
+	public function getNestingLevel()
+	{
+		return self::LEVEL_TOP;
+	}
+
+	/**
+	 * Set the subject of this message.
+	 *
+	 * @param string $subject
+	 *
+	 * @return $this
+	 */
+	public function setSubject($subject)
+	{
+		if (!$this->setHeaderFieldModel('Subject', $subject)) {
+			$this->getHeaders()->addTextHeader('Subject', $subject);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the subject of this message.
+	 *
+	 * @return string
+	 */
+	public function getSubject()
+	{
+		return $this->getHeaderFieldModel('Subject');
+	}
+
+	/**
+	 * Set the date at which this message was created.
+	 *
+	 * @return $this
+	 */
+	public function setDate(DateTimeInterface $dateTime)
+	{
+		if (!$this->setHeaderFieldModel('Date', $dateTime)) {
+			$this->getHeaders()->addDateHeader('Date', $dateTime);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the date at which this message was created.
+	 *
+	 * @return DateTimeInterface
+	 */
+	public function getDate()
+	{
+		return $this->getHeaderFieldModel('Date');
+	}
+
+	/**
+	 * Set the return-path (the bounce address) of this message.
+	 *
+	 * @param string $address
+	 *
+	 * @return $this
+	 */
+	public function setReturnPath($address)
+	{
+		if (!$this->setHeaderFieldModel('Return-Path', $address)) {
+			$this->getHeaders()->addPathHeader('Return-Path', $address);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the return-path (bounce address) of this message.
+	 *
+	 * @return string
+	 */
+	public function getReturnPath()
+	{
+		return $this->getHeaderFieldModel('Return-Path');
+	}
+
+	/**
+	 * Set the sender of this message.
+	 *
+	 * This does not override the From field, but it has a higher significance.
+	 *
+	 * @param string $address
+	 * @param string $name    optional
+	 *
+	 * @return $this
+	 */
+	public function setSender($address, $name = null)
+	{
+		if (!\is_array($address) && isset($name)) {
+			$address = [$address => $name];
+		}
+
+		if (!$this->setHeaderFieldModel('Sender', (array) $address)) {
+			$this->getHeaders()->addMailboxHeader('Sender', (array) $address);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the sender of this message.
+	 *
+	 * @return string
+	 */
+	public function getSender()
+	{
+		return $this->getHeaderFieldModel('Sender');
+	}
+
+	/**
+	 * Add a From: address to this message.
+	 *
+	 * If $name is passed this name will be associated with the address.
+	 *
+	 * @param string $address
+	 * @param string $name    optional
+	 *
+	 * @return $this
+	 */
+	public function addFrom($address, $name = null)
+	{
+		$current = $this->getFrom();
+		$current[$address] = $name;
+
+		return $this->setFrom($current);
+	}
+
+	/**
+	 * Set the from address of this message.
+	 *
+	 * You may pass an array of addresses if this message is from multiple people.
+	 *
+	 * If $name is passed and the first parameter is a string, this name will be
+	 * associated with the address.
+	 *
+	 * @param string|array $addresses
+	 * @param string       $name      optional
+	 *
+	 * @return $this
+	 */
+	public function setFrom($addresses, $name = null)
+	{
+		if (!\is_array($addresses) && isset($name)) {
+			$addresses = [$addresses => $name];
+		}
+
+		if (!$this->setHeaderFieldModel('From', (array) $addresses)) {
+			$this->getHeaders()->addMailboxHeader('From', (array) $addresses);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the from address of this message.
+	 *
+	 * @return mixed
+	 */
+	public function getFrom()
+	{
+		return $this->getHeaderFieldModel('From');
+	}
+
+	/**
+	 * Add a Reply-To: address to this message.
+	 *
+	 * If $name is passed this name will be associated with the address.
+	 *
+	 * @param string $address
+	 * @param string $name    optional
+	 *
+	 * @return $this
+	 */
+	public function addReplyTo($address, $name = null)
+	{
+		$current = $this->getReplyTo();
+		$current[$address] = $name;
+
+		return $this->setReplyTo($current);
+	}
+
+	/**
+	 * Set the reply-to address of this message.
+	 *
+	 * You may pass an array of addresses if replies will go to multiple people.
+	 *
+	 * If $name is passed and the first parameter is a string, this name will be
+	 * associated with the address.
+	 *
+	 * @param mixed  $addresses
+	 * @param string $name      optional
+	 *
+	 * @return $this
+	 */
+	public function setReplyTo($addresses, $name = null)
+	{
+		if (!\is_array($addresses) && isset($name)) {
+			$addresses = [$addresses => $name];
+		}
+
+		if (!$this->setHeaderFieldModel('Reply-To', (array) $addresses)) {
+			$this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the reply-to address of this message.
+	 *
+	 * @return string
+	 */
+	public function getReplyTo()
+	{
+		return $this->getHeaderFieldModel('Reply-To');
+	}
+
+	/**
+	 * Add a To: address to this message.
+	 *
+	 * If $name is passed this name will be associated with the address.
+	 *
+	 * @param string $address
+	 * @param string $name    optional
+	 *
+	 * @return $this
+	 */
+	public function addTo($address, $name = null)
+	{
+		$current = $this->getTo();
+		$current[$address] = $name;
+
+		return $this->setTo($current);
+	}
+
+	/**
+	 * Set the to addresses of this message.
+	 *
+	 * If multiple recipients will receive the message an array should be used.
+	 * Example: array('receiver@domain.org', 'other@domain.org' => 'A name')
+	 *
+	 * If $name is passed and the first parameter is a string, this name will be
+	 * associated with the address.
+	 *
+	 * @param mixed  $addresses
+	 * @param string $name      optional
+	 *
+	 * @return $this
+	 */
+	public function setTo($addresses, $name = null)
+	{
+		if (!\is_array($addresses) && isset($name)) {
+			$addresses = [$addresses => $name];
+		}
+
+		if (!$this->setHeaderFieldModel('To', (array) $addresses)) {
+			$this->getHeaders()->addMailboxHeader('To', (array) $addresses);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the To addresses of this message.
+	 *
+	 * @return array
+	 */
+	public function getTo()
+	{
+		return $this->getHeaderFieldModel('To');
+	}
+
+	/**
+	 * Add a Cc: address to this message.
+	 *
+	 * If $name is passed this name will be associated with the address.
+	 *
+	 * @param string $address
+	 * @param string $name    optional
+	 *
+	 * @return $this
+	 */
+	public function addCc($address, $name = null)
+	{
+		$current = $this->getCc();
+		$current[$address] = $name;
+
+		return $this->setCc($current);
+	}
+
+	/**
+	 * Set the Cc addresses of this message.
+	 *
+	 * If $name is passed and the first parameter is a string, this name will be
+	 * associated with the address.
+	 *
+	 * @param mixed  $addresses
+	 * @param string $name      optional
+	 *
+	 * @return $this
+	 */
+	public function setCc($addresses, $name = null)
+	{
+		if (!\is_array($addresses) && isset($name)) {
+			$addresses = [$addresses => $name];
+		}
+
+		if (!$this->setHeaderFieldModel('Cc', (array) $addresses)) {
+			$this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the Cc address of this message.
+	 *
+	 * @return array
+	 */
+	public function getCc()
+	{
+		return $this->getHeaderFieldModel('Cc');
+	}
+
+	/**
+	 * Add a Bcc: address to this message.
+	 *
+	 * If $name is passed this name will be associated with the address.
+	 *
+	 * @param string $address
+	 * @param string $name    optional
+	 *
+	 * @return $this
+	 */
+	public function addBcc($address, $name = null)
+	{
+		$current = $this->getBcc();
+		$current[$address] = $name;
+
+		return $this->setBcc($current);
+	}
+
+	/**
+	 * Set the Bcc addresses of this message.
+	 *
+	 * If $name is passed and the first parameter is a string, this name will be
+	 * associated with the address.
+	 *
+	 * @param mixed  $addresses
+	 * @param string $name      optional
+	 *
+	 * @return $this
+	 */
+	public function setBcc($addresses, $name = null)
+	{
+		if (!\is_array($addresses) && isset($name)) {
+			$addresses = [$addresses => $name];
+		}
+
+		if (!$this->setHeaderFieldModel('Bcc', (array) $addresses)) {
+			$this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the Bcc addresses of this message.
+	 *
+	 * @return array
+	 */
+	public function getBcc()
+	{
+		return $this->getHeaderFieldModel('Bcc');
+	}
+
+	/**
+	 * Set the priority of this message.
+	 *
+	 * The value is an integer where 1 is the highest priority and 5 is the lowest.
+	 *
+	 * @param int $priority
+	 *
+	 * @return $this
+	 */
+	public function setPriority($priority)
+	{
+		$priorityMap = [
+			self::PRIORITY_HIGHEST => 'Highest',
+			self::PRIORITY_HIGH => 'High',
+			self::PRIORITY_NORMAL => 'Normal',
+			self::PRIORITY_LOW => 'Low',
+			self::PRIORITY_LOWEST => 'Lowest',
+			];
+		$pMapKeys = array_keys($priorityMap);
+		if ($priority > max($pMapKeys)) {
+			$priority = max($pMapKeys);
+		} elseif ($priority < min($pMapKeys)) {
+			$priority = min($pMapKeys);
+		}
+		if (!$this->setHeaderFieldModel('X-Priority',
+			sprintf('%d (%s)', $priority, $priorityMap[$priority]))) {
+			$this->getHeaders()->addTextHeader('X-Priority',
+				sprintf('%d (%s)', $priority, $priorityMap[$priority]));
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the priority of this message.
+	 *
+	 * The returned value is an integer where 1 is the highest priority and 5
+	 * is the lowest.
+	 *
+	 * @return int
+	 */
+	public function getPriority()
+	{
+		list($priority) = sscanf($this->getHeaderFieldModel('X-Priority'),
+			'%[1-5]'
+			);
+
+		return $priority ?? 3;
+	}
+
+	/**
+	 * Ask for a delivery receipt from the recipient to be sent to $addresses.
+	 *
+	 * @param array $addresses
+	 *
+	 * @return $this
+	 */
+	public function setReadReceiptTo($addresses)
+	{
+		if (!$this->setHeaderFieldModel('Disposition-Notification-To', $addresses)) {
+			$this->getHeaders()
+				->addMailboxHeader('Disposition-Notification-To', $addresses);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Get the addresses to which a read-receipt will be sent.
+	 *
+	 * @return string
+	 */
+	public function getReadReceiptTo()
+	{
+		return $this->getHeaderFieldModel('Disposition-Notification-To');
+	}
+
+	/**
+	 * Attach a {@link Swift_Mime_SimpleMimeEntity} such as an Attachment or MimePart.
+	 *
+	 * @return $this
+	 */
+	public function attach(Swift_Mime_SimpleMimeEntity $entity)
+	{
+		$this->setChildren(array_merge($this->getChildren(), [$entity]));
+
+		return $this;
+	}
+
+	/**
+	 * Remove an already attached entity.
+	 *
+	 * @return $this
+	 */
+	public function detach(Swift_Mime_SimpleMimeEntity $entity)
+	{
+		$newChildren = [];
+		foreach ($this->getChildren() as $child) {
+			if ($entity !== $child) {
+				$newChildren[] = $child;
+			}
+		}
+		$this->setChildren($newChildren);
+
+		return $this;
+	}
+
+	/**
+	 * Attach a {@link Swift_Mime_SimpleMimeEntity} and return it's CID source.
+	 *
+	 * This method should be used when embedding images or other data in a message.
+	 *
+	 * @return string
+	 */
+	public function embed(Swift_Mime_SimpleMimeEntity $entity)
+	{
+		$this->attach($entity);
+
+		return 'cid:'.$entity->getId();
+	}
+
+	/**
+	 * Get this message as a complete string.
+	 *
+	 * @return string
+	 */
+	public function toString()
+	{
+		if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+			$this->setChildren(array_merge([$this->becomeMimePart()], $children));
+			$string = parent::toString();
+			$this->setChildren($children);
+		} else {
+			$string = parent::toString();
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Returns a string representation of this object.
+	 *
+	 * @see toString()
+	 *
+	 * @return string
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/**
+	 * Write this message to a {@link Swift_InputByteStream}.
+	 */
+	public function toByteStream(Swift_InputByteStream $is)
+	{
+		if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+			$this->setChildren(array_merge([$this->becomeMimePart()], $children));
+			parent::toByteStream($is);
+			$this->setChildren($children);
+		} else {
+			parent::toByteStream($is);
+		}
+	}
+
+	/** @see Swift_Mime_SimpleMimeEntity::getIdField() */
+	protected function getIdField()
+	{
+		return 'Message-ID';
+	}
+
+	/** Turn the body of this message into a child of itself if needed */
+	protected function becomeMimePart()
+	{
+		$part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
+			$this->getCache(), $this->getIdGenerator(), $this->userCharset
+			);
+		$part->setContentType($this->userContentType);
+		$part->setBody($this->getBody());
+		$part->setFormat($this->userFormat);
+		$part->setDelSp($this->userDelSp);
+		$part->setNestingLevel($this->getTopNestingLevel());
+
+		return $part;
+	}
+
+	/** Get the highest nesting level nested inside this message */
+	private function getTopNestingLevel()
+	{
+		$highestLevel = $this->getNestingLevel();
+		foreach ($this->getChildren() as $child) {
+			$childLevel = $child->getNestingLevel();
+			if ($highestLevel < $childLevel) {
+				$highestLevel = $childLevel;
+			}
+		}
+
+		return $highestLevel;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php

Indentation +34 added lines, -34 removed lines

@@ -15,41 +15,41 @@
  */
 class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64Encoder implements Swift_Mime_HeaderEncoder
 {
-    /**
-     * Get the name of this encoding scheme.
-     * Returns the string 'B'.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'B';
-    }
+	/**
+	 * Get the name of this encoding scheme.
+	 * Returns the string 'B'.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'B';
+	}
 
-    /**
-     * Takes an unencoded string and produces a Base64 encoded string from it.
-     *
-     * If the charset is iso-2022-jp, it uses mb_encode_mimeheader instead of
-     * default encodeString, otherwise pass to the parent method.
-     *
-     * @param string $string          string to encode
-     * @param int    $firstLineOffset
-     * @param int    $maxLineLength   optional, 0 indicates the default of 76 bytes
-     * @param string $charset
-     *
-     * @return string
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
-    {
-        if ('iso-2022-jp' === strtolower($charset ?? '')) {
-            $old = mb_internal_encoding();
-            mb_internal_encoding('utf-8');
-            $newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
-            mb_internal_encoding($old);
+	/**
+	 * Takes an unencoded string and produces a Base64 encoded string from it.
+	 *
+	 * If the charset is iso-2022-jp, it uses mb_encode_mimeheader instead of
+	 * default encodeString, otherwise pass to the parent method.
+	 *
+	 * @param string $string          string to encode
+	 * @param int    $firstLineOffset
+	 * @param int    $maxLineLength   optional, 0 indicates the default of 76 bytes
+	 * @param string $charset
+	 *
+	 * @return string
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
+	{
+		if ('iso-2022-jp' === strtolower($charset ?? '')) {
+			$old = mb_internal_encoding();
+			mb_internal_encoding('utf-8');
+			$newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
+			mb_internal_encoding($old);
 
-            return $newstring;
-        }
+			return $newstring;
+		}
 
-        return parent::encodeString($string, $firstLineOffset, $maxLineLength);
-    }
+		return parent::encodeString($string, $firstLineOffset, $maxLineLength);
+	}
 }