Dolibarr / dolibarr

htdocs/includes/swiftmailer/lib/classes/Swift/Message.php

Indentation +261 added lines, -261 removed lines

@@ -15,265 +15,265 @@
  */
 class Swift_Message extends Swift_Mime_SimpleMessage
 {
-    /**
-     * @var Swift_Signers_HeaderSigner[]
-     */
-    private $headerSigners = [];
-
-    /**
-     * @var Swift_Signers_BodySigner[]
-     */
-    private $bodySigners = [];
-
-    /**
-     * @var array
-     */
-    private $savedMessage = [];
-
-    /**
-     * Create a new Message.
-     *
-     * Details may be optionally passed into the constructor.
-     *
-     * @param string $subject
-     * @param string $body
-     * @param string $contentType
-     * @param string $charset
-     */
-    public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
-    {
-        \call_user_func_array(
-            [$this, 'Swift_Mime_SimpleMessage::__construct'],
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('mime.message')
-            );
-
-        if (!isset($charset)) {
-            $charset = Swift_DependencyContainer::getInstance()
-                ->lookup('properties.charset');
-        }
-        $this->setSubject($subject);
-        $this->setBody($body);
-        $this->setCharset($charset);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
-    }
-
-    /**
-     * Add a MimePart to this Message.
-     *
-     * @param string|Swift_OutputByteStream $body
-     * @param string                        $contentType
-     * @param string                        $charset
-     *
-     * @return $this
-     */
-    public function addPart($body, $contentType = null, $charset = null)
-    {
-        return $this->attach((new Swift_MimePart($body, $contentType, $charset))->setEncoder($this->getEncoder()));
-    }
-
-    /**
-     * Attach a new signature handler to the message.
-     *
-     * @return $this
-     */
-    public function attachSigner(Swift_Signer $signer)
-    {
-        if ($signer instanceof Swift_Signers_HeaderSigner) {
-            $this->headerSigners[] = $signer;
-        } elseif ($signer instanceof Swift_Signers_BodySigner) {
-            $this->bodySigners[] = $signer;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Detach a signature handler from a message.
-     *
-     * @return $this
-     */
-    public function detachSigner(Swift_Signer $signer)
-    {
-        if ($signer instanceof Swift_Signers_HeaderSigner) {
-            foreach ($this->headerSigners as $k => $headerSigner) {
-                if ($headerSigner === $signer) {
-                    unset($this->headerSigners[$k]);
-
-                    return $this;
-                }
-            }
-        } elseif ($signer instanceof Swift_Signers_BodySigner) {
-            foreach ($this->bodySigners as $k => $bodySigner) {
-                if ($bodySigner === $signer) {
-                    unset($this->bodySigners[$k]);
-
-                    return $this;
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Clear all signature handlers attached to the message.
-     *
-     * @return $this
-     */
-    public function clearSigners()
-    {
-        $this->headerSigners = [];
-        $this->bodySigners = [];
-
-        return $this;
-    }
-
-    /**
-     * Get this message as a complete string.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        if (empty($this->headerSigners) && empty($this->bodySigners)) {
-            return parent::toString();
-        }
-
-        $this->saveMessage();
-
-        $this->doSign();
-
-        $string = parent::toString();
-
-        $this->restoreMessage();
-
-        return $string;
-    }
-
-    /**
-     * Write this message to a {@link Swift_InputByteStream}.
-     */
-    public function toByteStream(Swift_InputByteStream $is)
-    {
-        if (empty($this->headerSigners) && empty($this->bodySigners)) {
-            parent::toByteStream($is);
-
-            return;
-        }
-
-        $this->saveMessage();
-
-        $this->doSign();
-
-        parent::toByteStream($is);
-
-        $this->restoreMessage();
-    }
-
-    public function __wakeup()
-    {
-        Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message');
-    }
-
-    /**
-     * loops through signers and apply the signatures.
-     */
-    protected function doSign()
-    {
-        foreach ($this->bodySigners as $signer) {
-            $altered = $signer->getAlteredHeaders();
-            $this->saveHeaders($altered);
-            $signer->signMessage($this);
-        }
-
-        foreach ($this->headerSigners as $signer) {
-            $altered = $signer->getAlteredHeaders();
-            $this->saveHeaders($altered);
-            $signer->reset();
-
-            $signer->setHeaders($this->getHeaders());
-
-            $signer->startBody();
-            $this->bodyToByteStream($signer);
-            $signer->endBody();
-
-            $signer->addSignature($this->getHeaders());
-        }
-    }
-
-    /**
-     * save the message before any signature is applied.
-     */
-    protected function saveMessage()
-    {
-        $this->savedMessage = ['headers' => []];
-        $this->savedMessage['body'] = $this->getBody();
-        $this->savedMessage['children'] = $this->getChildren();
-        if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
-            $this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
-            $this->setBody('');
-        }
-    }
-
-    /**
-     * save the original headers.
-     */
-    protected function saveHeaders(array $altered)
-    {
-        foreach ($altered as $head) {
-            $lc = strtolower($head ?? '');
-
-            if (!isset($this->savedMessage['headers'][$lc])) {
-                $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
-            }
-        }
-    }
-
-    /**
-     * Remove or restore altered headers.
-     */
-    protected function restoreHeaders()
-    {
-        foreach ($this->savedMessage['headers'] as $name => $savedValue) {
-            $headers = $this->getHeaders()->getAll($name);
-
-            foreach ($headers as $key => $value) {
-                if (!isset($savedValue[$key])) {
-                    $this->getHeaders()->remove($name, $key);
-                }
-            }
-        }
-    }
-
-    /**
-     * Restore message body.
-     */
-    protected function restoreMessage()
-    {
-        $this->setBody($this->savedMessage['body']);
-        $this->setChildren($this->savedMessage['children']);
-
-        $this->restoreHeaders();
-        $this->savedMessage = [];
-    }
-
-    /**
-     * Clone Message Signers.
-     *
-     * @see Swift_Mime_SimpleMimeEntity::__clone()
-     */
-    public function __clone()
-    {
-        parent::__clone();
-        foreach ($this->bodySigners as $key => $bodySigner) {
-            $this->bodySigners[$key] = clone $bodySigner;
-        }
-
-        foreach ($this->headerSigners as $key => $headerSigner) {
-            $this->headerSigners[$key] = clone $headerSigner;
-        }
-    }
+	/**
+	 * @var Swift_Signers_HeaderSigner[]
+	 */
+	private $headerSigners = [];
+
+	/**
+	 * @var Swift_Signers_BodySigner[]
+	 */
+	private $bodySigners = [];
+
+	/**
+	 * @var array
+	 */
+	private $savedMessage = [];
+
+	/**
+	 * Create a new Message.
+	 *
+	 * Details may be optionally passed into the constructor.
+	 *
+	 * @param string $subject
+	 * @param string $body
+	 * @param string $contentType
+	 * @param string $charset
+	 */
+	public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
+	{
+		\call_user_func_array(
+			[$this, 'Swift_Mime_SimpleMessage::__construct'],
+			Swift_DependencyContainer::getInstance()
+				->createDependenciesFor('mime.message')
+			);
+
+		if (!isset($charset)) {
+			$charset = Swift_DependencyContainer::getInstance()
+				->lookup('properties.charset');
+		}
+		$this->setSubject($subject);
+		$this->setBody($body);
+		$this->setCharset($charset);
+		if ($contentType) {
+			$this->setContentType($contentType);
+		}
+	}
+
+	/**
+	 * Add a MimePart to this Message.
+	 *
+	 * @param string|Swift_OutputByteStream $body
+	 * @param string                        $contentType
+	 * @param string                        $charset
+	 *
+	 * @return $this
+	 */
+	public function addPart($body, $contentType = null, $charset = null)
+	{
+		return $this->attach((new Swift_MimePart($body, $contentType, $charset))->setEncoder($this->getEncoder()));
+	}
+
+	/**
+	 * Attach a new signature handler to the message.
+	 *
+	 * @return $this
+	 */
+	public function attachSigner(Swift_Signer $signer)
+	{
+		if ($signer instanceof Swift_Signers_HeaderSigner) {
+			$this->headerSigners[] = $signer;
+		} elseif ($signer instanceof Swift_Signers_BodySigner) {
+			$this->bodySigners[] = $signer;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Detach a signature handler from a message.
+	 *
+	 * @return $this
+	 */
+	public function detachSigner(Swift_Signer $signer)
+	{
+		if ($signer instanceof Swift_Signers_HeaderSigner) {
+			foreach ($this->headerSigners as $k => $headerSigner) {
+				if ($headerSigner === $signer) {
+					unset($this->headerSigners[$k]);
+
+					return $this;
+				}
+			}
+		} elseif ($signer instanceof Swift_Signers_BodySigner) {
+			foreach ($this->bodySigners as $k => $bodySigner) {
+				if ($bodySigner === $signer) {
+					unset($this->bodySigners[$k]);
+
+					return $this;
+				}
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Clear all signature handlers attached to the message.
+	 *
+	 * @return $this
+	 */
+	public function clearSigners()
+	{
+		$this->headerSigners = [];
+		$this->bodySigners = [];
+
+		return $this;
+	}
+
+	/**
+	 * Get this message as a complete string.
+	 *
+	 * @return string
+	 */
+	public function toString()
+	{
+		if (empty($this->headerSigners) && empty($this->bodySigners)) {
+			return parent::toString();
+		}
+
+		$this->saveMessage();
+
+		$this->doSign();
+
+		$string = parent::toString();
+
+		$this->restoreMessage();
+
+		return $string;
+	}
+
+	/**
+	 * Write this message to a {@link Swift_InputByteStream}.
+	 */
+	public function toByteStream(Swift_InputByteStream $is)
+	{
+		if (empty($this->headerSigners) && empty($this->bodySigners)) {
+			parent::toByteStream($is);
+
+			return;
+		}
+
+		$this->saveMessage();
+
+		$this->doSign();
+
+		parent::toByteStream($is);
+
+		$this->restoreMessage();
+	}
+
+	public function __wakeup()
+	{
+		Swift_DependencyContainer::getInstance()->createDependenciesFor('mime.message');
+	}
+
+	/**
+	 * loops through signers and apply the signatures.
+	 */
+	protected function doSign()
+	{
+		foreach ($this->bodySigners as $signer) {
+			$altered = $signer->getAlteredHeaders();
+			$this->saveHeaders($altered);
+			$signer->signMessage($this);
+		}
+
+		foreach ($this->headerSigners as $signer) {
+			$altered = $signer->getAlteredHeaders();
+			$this->saveHeaders($altered);
+			$signer->reset();
+
+			$signer->setHeaders($this->getHeaders());
+
+			$signer->startBody();
+			$this->bodyToByteStream($signer);
+			$signer->endBody();
+
+			$signer->addSignature($this->getHeaders());
+		}
+	}
+
+	/**
+	 * save the message before any signature is applied.
+	 */
+	protected function saveMessage()
+	{
+		$this->savedMessage = ['headers' => []];
+		$this->savedMessage['body'] = $this->getBody();
+		$this->savedMessage['children'] = $this->getChildren();
+		if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
+			$this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
+			$this->setBody('');
+		}
+	}
+
+	/**
+	 * save the original headers.
+	 */
+	protected function saveHeaders(array $altered)
+	{
+		foreach ($altered as $head) {
+			$lc = strtolower($head ?? '');
+
+			if (!isset($this->savedMessage['headers'][$lc])) {
+				$this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
+			}
+		}
+	}
+
+	/**
+	 * Remove or restore altered headers.
+	 */
+	protected function restoreHeaders()
+	{
+		foreach ($this->savedMessage['headers'] as $name => $savedValue) {
+			$headers = $this->getHeaders()->getAll($name);
+
+			foreach ($headers as $key => $value) {
+				if (!isset($savedValue[$key])) {
+					$this->getHeaders()->remove($name, $key);
+				}
+			}
+		}
+	}
+
+	/**
+	 * Restore message body.
+	 */
+	protected function restoreMessage()
+	{
+		$this->setBody($this->savedMessage['body']);
+		$this->setChildren($this->savedMessage['children']);
+
+		$this->restoreHeaders();
+		$this->savedMessage = [];
+	}
+
+	/**
+	 * Clone Message Signers.
+	 *
+	 * @see Swift_Mime_SimpleMimeEntity::__clone()
+	 */
+	public function __clone()
+	{
+		parent::__clone();
+		foreach ($this->bodySigners as $key => $bodySigner) {
+			$this->bodySigners[$key] = clone $bodySigner;
+		}
+
+		foreach ($this->headerSigners as $key => $headerSigner) {
+			$this->headerSigners[$key] = clone $headerSigner;
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php

Indentation +252 added lines, -252 removed lines

@@ -17,284 +17,284 @@
  */
 class Swift_Encoder_QpEncoder implements Swift_Encoder
 {
-    /**
-     * The CharacterStream used for reading characters (as opposed to bytes).
-     *
-     * @var Swift_CharacterStream
-     */
-    protected $charStream;
+	/**
+	 * The CharacterStream used for reading characters (as opposed to bytes).
+	 *
+	 * @var Swift_CharacterStream
+	 */
+	protected $charStream;
 
-    /**
-     * A filter used if input should be canonicalized.
-     *
-     * @var Swift_StreamFilter
-     */
-    protected $filter;
+	/**
+	 * A filter used if input should be canonicalized.
+	 *
+	 * @var Swift_StreamFilter
+	 */
+	protected $filter;
 
-    /**
-     * Pre-computed QP for HUGE optimization.
-     *
-     * @var string[]
-     */
-    protected static $qpMap = [
-        0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
-        5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
-        10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
-        15 => '=0F', 16 => '=10', 17 => '=11', 18 => '=12', 19 => '=13',
-        20 => '=14', 21 => '=15', 22 => '=16', 23 => '=17', 24 => '=18',
-        25 => '=19', 26 => '=1A', 27 => '=1B', 28 => '=1C', 29 => '=1D',
-        30 => '=1E', 31 => '=1F', 32 => '=20', 33 => '=21', 34 => '=22',
-        35 => '=23', 36 => '=24', 37 => '=25', 38 => '=26', 39 => '=27',
-        40 => '=28', 41 => '=29', 42 => '=2A', 43 => '=2B', 44 => '=2C',
-        45 => '=2D', 46 => '=2E', 47 => '=2F', 48 => '=30', 49 => '=31',
-        50 => '=32', 51 => '=33', 52 => '=34', 53 => '=35', 54 => '=36',
-        55 => '=37', 56 => '=38', 57 => '=39', 58 => '=3A', 59 => '=3B',
-        60 => '=3C', 61 => '=3D', 62 => '=3E', 63 => '=3F', 64 => '=40',
-        65 => '=41', 66 => '=42', 67 => '=43', 68 => '=44', 69 => '=45',
-        70 => '=46', 71 => '=47', 72 => '=48', 73 => '=49', 74 => '=4A',
-        75 => '=4B', 76 => '=4C', 77 => '=4D', 78 => '=4E', 79 => '=4F',
-        80 => '=50', 81 => '=51', 82 => '=52', 83 => '=53', 84 => '=54',
-        85 => '=55', 86 => '=56', 87 => '=57', 88 => '=58', 89 => '=59',
-        90 => '=5A', 91 => '=5B', 92 => '=5C', 93 => '=5D', 94 => '=5E',
-        95 => '=5F', 96 => '=60', 97 => '=61', 98 => '=62', 99 => '=63',
-        100 => '=64', 101 => '=65', 102 => '=66', 103 => '=67', 104 => '=68',
-        105 => '=69', 106 => '=6A', 107 => '=6B', 108 => '=6C', 109 => '=6D',
-        110 => '=6E', 111 => '=6F', 112 => '=70', 113 => '=71', 114 => '=72',
-        115 => '=73', 116 => '=74', 117 => '=75', 118 => '=76', 119 => '=77',
-        120 => '=78', 121 => '=79', 122 => '=7A', 123 => '=7B', 124 => '=7C',
-        125 => '=7D', 126 => '=7E', 127 => '=7F', 128 => '=80', 129 => '=81',
-        130 => '=82', 131 => '=83', 132 => '=84', 133 => '=85', 134 => '=86',
-        135 => '=87', 136 => '=88', 137 => '=89', 138 => '=8A', 139 => '=8B',
-        140 => '=8C', 141 => '=8D', 142 => '=8E', 143 => '=8F', 144 => '=90',
-        145 => '=91', 146 => '=92', 147 => '=93', 148 => '=94', 149 => '=95',
-        150 => '=96', 151 => '=97', 152 => '=98', 153 => '=99', 154 => '=9A',
-        155 => '=9B', 156 => '=9C', 157 => '=9D', 158 => '=9E', 159 => '=9F',
-        160 => '=A0', 161 => '=A1', 162 => '=A2', 163 => '=A3', 164 => '=A4',
-        165 => '=A5', 166 => '=A6', 167 => '=A7', 168 => '=A8', 169 => '=A9',
-        170 => '=AA', 171 => '=AB', 172 => '=AC', 173 => '=AD', 174 => '=AE',
-        175 => '=AF', 176 => '=B0', 177 => '=B1', 178 => '=B2', 179 => '=B3',
-        180 => '=B4', 181 => '=B5', 182 => '=B6', 183 => '=B7', 184 => '=B8',
-        185 => '=B9', 186 => '=BA', 187 => '=BB', 188 => '=BC', 189 => '=BD',
-        190 => '=BE', 191 => '=BF', 192 => '=C0', 193 => '=C1', 194 => '=C2',
-        195 => '=C3', 196 => '=C4', 197 => '=C5', 198 => '=C6', 199 => '=C7',
-        200 => '=C8', 201 => '=C9', 202 => '=CA', 203 => '=CB', 204 => '=CC',
-        205 => '=CD', 206 => '=CE', 207 => '=CF', 208 => '=D0', 209 => '=D1',
-        210 => '=D2', 211 => '=D3', 212 => '=D4', 213 => '=D5', 214 => '=D6',
-        215 => '=D7', 216 => '=D8', 217 => '=D9', 218 => '=DA', 219 => '=DB',
-        220 => '=DC', 221 => '=DD', 222 => '=DE', 223 => '=DF', 224 => '=E0',
-        225 => '=E1', 226 => '=E2', 227 => '=E3', 228 => '=E4', 229 => '=E5',
-        230 => '=E6', 231 => '=E7', 232 => '=E8', 233 => '=E9', 234 => '=EA',
-        235 => '=EB', 236 => '=EC', 237 => '=ED', 238 => '=EE', 239 => '=EF',
-        240 => '=F0', 241 => '=F1', 242 => '=F2', 243 => '=F3', 244 => '=F4',
-        245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
-        250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
-        255 => '=FF',
-        ];
+	/**
+	 * Pre-computed QP for HUGE optimization.
+	 *
+	 * @var string[]
+	 */
+	protected static $qpMap = [
+		0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
+		5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
+		10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
+		15 => '=0F', 16 => '=10', 17 => '=11', 18 => '=12', 19 => '=13',
+		20 => '=14', 21 => '=15', 22 => '=16', 23 => '=17', 24 => '=18',
+		25 => '=19', 26 => '=1A', 27 => '=1B', 28 => '=1C', 29 => '=1D',
+		30 => '=1E', 31 => '=1F', 32 => '=20', 33 => '=21', 34 => '=22',
+		35 => '=23', 36 => '=24', 37 => '=25', 38 => '=26', 39 => '=27',
+		40 => '=28', 41 => '=29', 42 => '=2A', 43 => '=2B', 44 => '=2C',
+		45 => '=2D', 46 => '=2E', 47 => '=2F', 48 => '=30', 49 => '=31',
+		50 => '=32', 51 => '=33', 52 => '=34', 53 => '=35', 54 => '=36',
+		55 => '=37', 56 => '=38', 57 => '=39', 58 => '=3A', 59 => '=3B',
+		60 => '=3C', 61 => '=3D', 62 => '=3E', 63 => '=3F', 64 => '=40',
+		65 => '=41', 66 => '=42', 67 => '=43', 68 => '=44', 69 => '=45',
+		70 => '=46', 71 => '=47', 72 => '=48', 73 => '=49', 74 => '=4A',
+		75 => '=4B', 76 => '=4C', 77 => '=4D', 78 => '=4E', 79 => '=4F',
+		80 => '=50', 81 => '=51', 82 => '=52', 83 => '=53', 84 => '=54',
+		85 => '=55', 86 => '=56', 87 => '=57', 88 => '=58', 89 => '=59',
+		90 => '=5A', 91 => '=5B', 92 => '=5C', 93 => '=5D', 94 => '=5E',
+		95 => '=5F', 96 => '=60', 97 => '=61', 98 => '=62', 99 => '=63',
+		100 => '=64', 101 => '=65', 102 => '=66', 103 => '=67', 104 => '=68',
+		105 => '=69', 106 => '=6A', 107 => '=6B', 108 => '=6C', 109 => '=6D',
+		110 => '=6E', 111 => '=6F', 112 => '=70', 113 => '=71', 114 => '=72',
+		115 => '=73', 116 => '=74', 117 => '=75', 118 => '=76', 119 => '=77',
+		120 => '=78', 121 => '=79', 122 => '=7A', 123 => '=7B', 124 => '=7C',
+		125 => '=7D', 126 => '=7E', 127 => '=7F', 128 => '=80', 129 => '=81',
+		130 => '=82', 131 => '=83', 132 => '=84', 133 => '=85', 134 => '=86',
+		135 => '=87', 136 => '=88', 137 => '=89', 138 => '=8A', 139 => '=8B',
+		140 => '=8C', 141 => '=8D', 142 => '=8E', 143 => '=8F', 144 => '=90',
+		145 => '=91', 146 => '=92', 147 => '=93', 148 => '=94', 149 => '=95',
+		150 => '=96', 151 => '=97', 152 => '=98', 153 => '=99', 154 => '=9A',
+		155 => '=9B', 156 => '=9C', 157 => '=9D', 158 => '=9E', 159 => '=9F',
+		160 => '=A0', 161 => '=A1', 162 => '=A2', 163 => '=A3', 164 => '=A4',
+		165 => '=A5', 166 => '=A6', 167 => '=A7', 168 => '=A8', 169 => '=A9',
+		170 => '=AA', 171 => '=AB', 172 => '=AC', 173 => '=AD', 174 => '=AE',
+		175 => '=AF', 176 => '=B0', 177 => '=B1', 178 => '=B2', 179 => '=B3',
+		180 => '=B4', 181 => '=B5', 182 => '=B6', 183 => '=B7', 184 => '=B8',
+		185 => '=B9', 186 => '=BA', 187 => '=BB', 188 => '=BC', 189 => '=BD',
+		190 => '=BE', 191 => '=BF', 192 => '=C0', 193 => '=C1', 194 => '=C2',
+		195 => '=C3', 196 => '=C4', 197 => '=C5', 198 => '=C6', 199 => '=C7',
+		200 => '=C8', 201 => '=C9', 202 => '=CA', 203 => '=CB', 204 => '=CC',
+		205 => '=CD', 206 => '=CE', 207 => '=CF', 208 => '=D0', 209 => '=D1',
+		210 => '=D2', 211 => '=D3', 212 => '=D4', 213 => '=D5', 214 => '=D6',
+		215 => '=D7', 216 => '=D8', 217 => '=D9', 218 => '=DA', 219 => '=DB',
+		220 => '=DC', 221 => '=DD', 222 => '=DE', 223 => '=DF', 224 => '=E0',
+		225 => '=E1', 226 => '=E2', 227 => '=E3', 228 => '=E4', 229 => '=E5',
+		230 => '=E6', 231 => '=E7', 232 => '=E8', 233 => '=E9', 234 => '=EA',
+		235 => '=EB', 236 => '=EC', 237 => '=ED', 238 => '=EE', 239 => '=EF',
+		240 => '=F0', 241 => '=F1', 242 => '=F2', 243 => '=F3', 244 => '=F4',
+		245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
+		250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
+		255 => '=FF',
+		];
 
-    protected static $safeMapShare = [];
+	protected static $safeMapShare = [];
 
-    /**
-     * A map of non-encoded ascii characters.
-     *
-     * @var string[]
-     */
-    protected $safeMap = [];
+	/**
+	 * A map of non-encoded ascii characters.
+	 *
+	 * @var string[]
+	 */
+	protected $safeMap = [];
 
-    /**
-     * Creates a new QpEncoder for the given CharacterStream.
-     *
-     * @param Swift_CharacterStream $charStream to use for reading characters
-     * @param Swift_StreamFilter    $filter     if input should be canonicalized
-     */
-    public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null)
-    {
-        $this->charStream = $charStream;
-        if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
-            $this->initSafeMap();
-            self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
-        } else {
-            $this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
-        }
-        $this->filter = $filter;
-    }
+	/**
+	 * Creates a new QpEncoder for the given CharacterStream.
+	 *
+	 * @param Swift_CharacterStream $charStream to use for reading characters
+	 * @param Swift_StreamFilter    $filter     if input should be canonicalized
+	 */
+	public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null)
+	{
+		$this->charStream = $charStream;
+		if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
+			$this->initSafeMap();
+			self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
+		} else {
+			$this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
+		}
+		$this->filter = $filter;
+	}
 
-    public function __sleep()
-    {
-        return ['charStream', 'filter'];
-    }
+	public function __sleep()
+	{
+		return ['charStream', 'filter'];
+	}
 
-    public function __wakeup()
-    {
-        if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
-            $this->initSafeMap();
-            self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
-        } else {
-            $this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
-        }
-    }
+	public function __wakeup()
+	{
+		if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
+			$this->initSafeMap();
+			self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
+		} else {
+			$this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
+		}
+	}
 
-    protected function getSafeMapShareId()
-    {
-        return static::class;
-    }
+	protected function getSafeMapShareId()
+	{
+		return static::class;
+	}
 
-    protected function initSafeMap()
-    {
-        foreach (array_merge(
-            [0x09, 0x20], range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
-            $this->safeMap[$byte] = \chr($byte);
-        }
-    }
+	protected function initSafeMap()
+	{
+		foreach (array_merge(
+			[0x09, 0x20], range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
+			$this->safeMap[$byte] = \chr($byte);
+		}
+	}
 
-    /**
-     * Takes an unencoded string and produces a QP encoded string from it.
-     *
-     * 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 string $string          to encode
-     * @param int    $firstLineOffset optional
-     * @param int    $maxLineLength   optional 0 indicates the default of 76 chars
-     *
-     * @return string
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        if ($maxLineLength > 76 || $maxLineLength <= 0) {
-            $maxLineLength = 76;
-        }
+	/**
+	 * Takes an unencoded string and produces a QP encoded string from it.
+	 *
+	 * 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 string $string          to encode
+	 * @param int    $firstLineOffset optional
+	 * @param int    $maxLineLength   optional 0 indicates the default of 76 chars
+	 *
+	 * @return string
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		if ($maxLineLength > 76 || $maxLineLength <= 0) {
+			$maxLineLength = 76;
+		}
 
-        $thisLineLength = $maxLineLength - $firstLineOffset;
+		$thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $lines = [];
-        $lNo = 0;
-        $lines[$lNo] = '';
-        $currentLine = &$lines[$lNo++];
-        $size = $lineLen = 0;
+		$lines = [];
+		$lNo = 0;
+		$lines[$lNo] = '';
+		$currentLine = &$lines[$lNo++];
+		$size = $lineLen = 0;
 
-        $this->charStream->flushContents();
-        $this->charStream->importString($string);
+		$this->charStream->flushContents();
+		$this->charStream->importString($string);
 
-        // Fetching more than 4 chars at one is slower, as is fetching fewer bytes
-        // Conveniently 4 chars is the UTF-8 safe number since UTF-8 has up to 6
-        // bytes per char and (6 * 4 * 3 = 72 chars per line) * =NN is 3 bytes
-        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;
-                    }
+		// Fetching more than 4 chars at one is slower, as is fetching fewer bytes
+		// Conveniently 4 chars is the UTF-8 safe number since UTF-8 has up to 6
+		// bytes per char and (6 * 4 * 3 = 72 chars per line) * =NN is 3 bytes
+		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);
-            }
+					foreach ($moreBytes as $b) {
+						$bytes[] = $b;
+					}
+				}
+				// And filter them
+				$bytes = $this->filter->filter($bytes);
+			}
 
-            $enc = $this->encodeByteSequence($bytes, $size);
+			$enc = $this->encodeByteSequence($bytes, $size);
 
-            $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + (false === $i ? $size : $i);
+			$i = strpos($enc, '=0D=0A');
+			$newLineLength = $lineLen + (false === $i ? $size : $i);
 
-            if ($currentLine && $newLineLength >= $thisLineLength) {
-                $lines[$lNo] = '';
-                $currentLine = &$lines[$lNo++];
-                $thisLineLength = $maxLineLength;
-                $lineLen = 0;
-            }
+			if ($currentLine && $newLineLength >= $thisLineLength) {
+				$lines[$lNo] = '';
+				$currentLine = &$lines[$lNo++];
+				$thisLineLength = $maxLineLength;
+				$lineLen = 0;
+			}
 
-            $currentLine .= $enc;
+			$currentLine .= $enc;
 
-            if (false === $i) {
-                $lineLen += $size;
-            } else {
-                // 6 is the length of '=0D=0A'.
-                $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
-            }
-        }
+			if (false === $i) {
+				$lineLen += $size;
+			} else {
+				// 6 is the length of '=0D=0A'.
+				$lineLen = $size - strrpos($enc, '=0D=0A') - 6;
+			}
+		}
 
-        return $this->standardize(implode("=\r\n", $lines));
-    }
+		return $this->standardize(implode("=\r\n", $lines));
+	}
 
-    /**
-     * Updates the charset used.
-     *
-     * @param string $charset
-     */
-    public function charsetChanged($charset)
-    {
-        $this->charStream->setCharacterSet($charset);
-    }
+	/**
+	 * Updates the charset used.
+	 *
+	 * @param string $charset
+	 */
+	public function charsetChanged($charset)
+	{
+		$this->charStream->setCharacterSet($charset);
+	}
 
-    /**
-     * Encode the given byte array into a verbatim QP form.
-     *
-     * @param int[] $bytes
-     * @param int   $size
-     *
-     * @return string
-     */
-    protected function encodeByteSequence(array $bytes, &$size)
-    {
-        $ret = '';
-        $size = 0;
-        foreach ($bytes as $b) {
-            if (isset($this->safeMap[$b])) {
-                $ret .= $this->safeMap[$b];
-                ++$size;
-            } else {
-                $ret .= self::$qpMap[$b];
-                $size += 3;
-            }
-        }
+	/**
+	 * Encode the given byte array into a verbatim QP form.
+	 *
+	 * @param int[] $bytes
+	 * @param int   $size
+	 *
+	 * @return string
+	 */
+	protected function encodeByteSequence(array $bytes, &$size)
+	{
+		$ret = '';
+		$size = 0;
+		foreach ($bytes as $b) {
+			if (isset($this->safeMap[$b])) {
+				$ret .= $this->safeMap[$b];
+				++$size;
+			} else {
+				$ret .= self::$qpMap[$b];
+				$size += 3;
+			}
+		}
 
-        return $ret;
-    }
+		return $ret;
+	}
 
-    /**
-     * Get the next sequence of bytes to read from the char stream.
-     *
-     * @param int $size number of bytes to read
-     *
-     * @return int[]
-     */
-    protected function nextSequence($size = 4)
-    {
-        return $this->charStream->readBytes($size);
-    }
+	/**
+	 * Get the next sequence of bytes to read from the char stream.
+	 *
+	 * @param int $size number of bytes to read
+	 *
+	 * @return int[]
+	 */
+	protected function nextSequence($size = 4)
+	{
+		return $this->charStream->readBytes($size);
+	}
 
-    /**
-     * Make sure CRLF is correct and HT/SPACE are in valid places.
-     *
-     * @param string $string
-     *
-     * @return string
-     */
-    protected function standardize($string)
-    {
-        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'],
-            ["=09\r\n", "=20\r\n", "\r\n"], $string
-            );
-        switch ($end = \ord(substr($string, -1))) {
-            case 0x09:
-            case 0x20:
-                $string = substr_replace($string, self::$qpMap[$end], -1);
-        }
+	/**
+	 * Make sure CRLF is correct and HT/SPACE are in valid places.
+	 *
+	 * @param string $string
+	 *
+	 * @return string
+	 */
+	protected function standardize($string)
+	{
+		$string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'],
+			["=09\r\n", "=20\r\n", "\r\n"], $string
+			);
+		switch ($end = \ord(substr($string, -1))) {
+			case 0x09:
+			case 0x20:
+				$string = substr_replace($string, self::$qpMap[$end], -1);
+		}
 
-        return $string;
-    }
+		return $string;
+	}
 
-    /**
-     * Make a deep copy of object.
-     */
-    public function __clone()
-    {
-        $this->charStream = clone $this->charStream;
-    }
+	/**
+	 * Make a deep copy of object.
+	 */
+	public function __clone()
+	{
+		$this->charStream = clone $this->charStream;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php

Indentation +63 added lines, -63 removed lines

@@ -15,76 +15,76 @@
  */
 class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
 {
-    /**
-     * A character stream to use when reading a string as characters instead of bytes.
-     *
-     * @var Swift_CharacterStream
-     */
-    private $charStream;
+	/**
+	 * A character stream to use when reading a string as characters instead of bytes.
+	 *
+	 * @var Swift_CharacterStream
+	 */
+	private $charStream;
 
-    /**
-     * Creates a new Rfc2231Encoder using the given character stream instance.
-     */
-    public function __construct(Swift_CharacterStream $charStream)
-    {
-        $this->charStream = $charStream;
-    }
+	/**
+	 * Creates a new Rfc2231Encoder using the given character stream instance.
+	 */
+	public function __construct(Swift_CharacterStream $charStream)
+	{
+		$this->charStream = $charStream;
+	}
 
-    /**
-     * Takes an unencoded string and produces a string encoded according to
-     * RFC 2231 from it.
-     *
-     * @param string $string
-     * @param int    $firstLineOffset
-     * @param int    $maxLineLength   optional, 0 indicates the default of 75 bytes
-     *
-     * @return string
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        $lines = [];
-        $lineCount = 0;
-        $lines[] = '';
-        $currentLine = &$lines[$lineCount++];
+	/**
+	 * Takes an unencoded string and produces a string encoded according to
+	 * RFC 2231 from it.
+	 *
+	 * @param string $string
+	 * @param int    $firstLineOffset
+	 * @param int    $maxLineLength   optional, 0 indicates the default of 75 bytes
+	 *
+	 * @return string
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		$lines = [];
+		$lineCount = 0;
+		$lines[] = '';
+		$currentLine = &$lines[$lineCount++];
 
-        if (0 >= $maxLineLength) {
-            $maxLineLength = 75;
-        }
+		if (0 >= $maxLineLength) {
+			$maxLineLength = 75;
+		}
 
-        $this->charStream->flushContents();
-        $this->charStream->importString($string);
+		$this->charStream->flushContents();
+		$this->charStream->importString($string);
 
-        $thisLineLength = $maxLineLength - $firstLineOffset;
+		$thisLineLength = $maxLineLength - $firstLineOffset;
 
-        while (false !== $char = $this->charStream->read(4)) {
-            $encodedChar = rawurlencode($char);
-            if (0 != \strlen($currentLine)
-                && \strlen($currentLine.$encodedChar) > $thisLineLength) {
-                $lines[] = '';
-                $currentLine = &$lines[$lineCount++];
-                $thisLineLength = $maxLineLength;
-            }
-            $currentLine .= $encodedChar;
-        }
+		while (false !== $char = $this->charStream->read(4)) {
+			$encodedChar = rawurlencode($char);
+			if (0 != \strlen($currentLine)
+				&& \strlen($currentLine.$encodedChar) > $thisLineLength) {
+				$lines[] = '';
+				$currentLine = &$lines[$lineCount++];
+				$thisLineLength = $maxLineLength;
+			}
+			$currentLine .= $encodedChar;
+		}
 
-        return implode("\r\n", $lines);
-    }
+		return implode("\r\n", $lines);
+	}
 
-    /**
-     * Updates the charset used.
-     *
-     * @param string $charset
-     */
-    public function charsetChanged($charset)
-    {
-        $this->charStream->setCharacterSet($charset);
-    }
+	/**
+	 * Updates the charset used.
+	 *
+	 * @param string $charset
+	 */
+	public function charsetChanged($charset)
+	{
+		$this->charStream->setCharacterSet($charset);
+	}
 
-    /**
-     * Make a deep copy of object.
-     */
-    public function __clone()
-    {
-        $this->charStream = clone $this->charStream;
-    }
+	/**
+	 * Make a deep copy of object.
+	 */
+	public function __clone()
+	{
+		$this->charStream = clone $this->charStream;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php

Indentation +36 added lines, -36 removed lines

@@ -15,44 +15,44 @@
  */
 class Swift_Encoder_Base64Encoder implements Swift_Encoder
 {
-    /**
-     * Takes an unencoded string and produces a Base64 encoded string from it.
-     *
-     * Base64 encoded strings have a maximum line length of 76 characters.
-     * If the first line needs to be shorter, indicate the difference with
-     * $firstLineOffset.
-     *
-     * @param string $string          to encode
-     * @param int    $firstLineOffset
-     * @param int    $maxLineLength   optional, 0 indicates the default of 76 bytes
-     *
-     * @return string
-     */
-    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
-    {
-        if (0 >= $maxLineLength || 76 < $maxLineLength) {
-            $maxLineLength = 76;
-        }
+	/**
+	 * Takes an unencoded string and produces a Base64 encoded string from it.
+	 *
+	 * Base64 encoded strings have a maximum line length of 76 characters.
+	 * If the first line needs to be shorter, indicate the difference with
+	 * $firstLineOffset.
+	 *
+	 * @param string $string          to encode
+	 * @param int    $firstLineOffset
+	 * @param int    $maxLineLength   optional, 0 indicates the default of 76 bytes
+	 *
+	 * @return string
+	 */
+	public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+	{
+		if (0 >= $maxLineLength || 76 < $maxLineLength) {
+			$maxLineLength = 76;
+		}
 
-        $encodedString = base64_encode($string ?? '');
-        $firstLine = '';
+		$encodedString = base64_encode($string ?? '');
+		$firstLine = '';
 
-        if (0 != $firstLineOffset) {
-            $firstLine = substr(
-                $encodedString, 0, $maxLineLength - $firstLineOffset
-                )."\r\n";
-            $encodedString = substr(
-                $encodedString, $maxLineLength - $firstLineOffset
-                );
-        }
+		if (0 != $firstLineOffset) {
+			$firstLine = substr(
+				$encodedString, 0, $maxLineLength - $firstLineOffset
+				)."\r\n";
+			$encodedString = substr(
+				$encodedString, $maxLineLength - $firstLineOffset
+				);
+		}
 
-        return $firstLine.trim(chunk_split($encodedString, $maxLineLength, "\r\n"));
-    }
+		return $firstLine.trim(chunk_split($encodedString, $maxLineLength, "\r\n"));
+	}
 
-    /**
-     * Does nothing.
-     */
-    public function charsetChanged($charset)
-    {
-    }
+	/**
+	 * Does nothing.
+	 */
+	public function charsetChanged($charset)
+	{
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/CharacterStream.php

Indentation +57 added lines, -57 removed lines

@@ -19,69 +19,69 @@
  */
 interface Swift_CharacterStream
 {
-    /**
-     * Set the character set used in this CharacterStream.
-     *
-     * @param string $charset
-     */
-    public function setCharacterSet($charset);
+	/**
+	 * Set the character set used in this CharacterStream.
+	 *
+	 * @param string $charset
+	 */
+	public function setCharacterSet($charset);
 
-    /**
-     * Set the CharacterReaderFactory for multi charset support.
-     */
-    public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory);
+	/**
+	 * Set the CharacterReaderFactory for multi charset support.
+	 */
+	public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory);
 
-    /**
-     * Overwrite this character stream using the byte sequence in the byte stream.
-     *
-     * @param Swift_OutputByteStream $os output stream to read from
-     */
-    public function importByteStream(Swift_OutputByteStream $os);
+	/**
+	 * Overwrite this character stream using the byte sequence in the byte stream.
+	 *
+	 * @param Swift_OutputByteStream $os output stream to read from
+	 */
+	public function importByteStream(Swift_OutputByteStream $os);
 
-    /**
-     * Import a string a bytes into this CharacterStream, overwriting any existing
-     * data in the stream.
-     *
-     * @param string $string
-     */
-    public function importString($string);
+	/**
+	 * Import a string a bytes into this CharacterStream, overwriting any existing
+	 * data in the stream.
+	 *
+	 * @param string $string
+	 */
+	public function importString($string);
 
-    /**
-     * Read $length characters from the stream and move the internal pointer
-     * $length further into the stream.
-     *
-     * @param int $length
-     *
-     * @return string
-     */
-    public function read($length);
+	/**
+	 * Read $length characters from the stream and move the internal pointer
+	 * $length further into the stream.
+	 *
+	 * @param int $length
+	 *
+	 * @return string
+	 */
+	public function read($length);
 
-    /**
-     * Read $length characters from the stream and return a 1-dimensional array
-     * containing there octet values.
-     *
-     * @param int $length
-     *
-     * @return int[]
-     */
-    public function readBytes($length);
+	/**
+	 * Read $length characters from the stream and return a 1-dimensional array
+	 * containing there octet values.
+	 *
+	 * @param int $length
+	 *
+	 * @return int[]
+	 */
+	public function readBytes($length);
 
-    /**
-     * Write $chars to the end of the stream.
-     *
-     * @param string $chars
-     */
-    public function write($chars);
+	/**
+	 * Write $chars to the end of the stream.
+	 *
+	 * @param string $chars
+	 */
+	public function write($chars);
 
-    /**
-     * Move the internal pointer to $charOffset in the stream.
-     *
-     * @param int $charOffset
-     */
-    public function setPointer($charOffset);
+	/**
+	 * Move the internal pointer to $charOffset in the stream.
+	 *
+	 * @param int $charOffset
+	 */
+	public function setPointer($charOffset);
 
-    /**
-     * Empty the stream and reset the internal pointer.
-     */
-    public function flushContents();
+	/**
+	 * Empty the stream and reset the internal pointer.
+	 */
+	public function flushContents();
 }

htdocs/includes/swiftmailer/lib/classes/Swift/TransportException.php

Indentation +10 added lines, -10 removed lines

@@ -15,14 +15,14 @@
  */
 class Swift_TransportException extends Swift_IoException
 {
-    /**
-     * Create a new TransportException with $message.
-     *
-     * @param string $message
-     * @param int    $code
-     */
-    public function __construct($message, $code = 0, Exception $previous = null)
-    {
-        parent::__construct($message, $code, $previous);
-    }
+	/**
+	 * Create a new TransportException with $message.
+	 *
+	 * @param string $message
+	 * @param int    $code
+	 */
+	public function __construct($message, $code = 0, Exception $previous = null)
+	{
+		parent::__construct($message, $code, $previous);
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Image.php

Indentation +24 added lines, -24 removed lines

@@ -15,29 +15,29 @@
  */
 class Swift_Image extends Swift_EmbeddedFile
 {
-    /**
-     * Create a new EmbeddedFile.
-     *
-     * Details may be optionally provided to the constructor.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     */
-    public function __construct($data = null, $filename = null, $contentType = null)
-    {
-        parent::__construct($data, $filename, $contentType);
-    }
+	/**
+	 * Create a new EmbeddedFile.
+	 *
+	 * Details may be optionally provided to the constructor.
+	 *
+	 * @param string|Swift_OutputByteStream $data
+	 * @param string                        $filename
+	 * @param string                        $contentType
+	 */
+	public function __construct($data = null, $filename = null, $contentType = null)
+	{
+		parent::__construct($data, $filename, $contentType);
+	}
 
-    /**
-     * Create a new Image from a filesystem path.
-     *
-     * @param string $path
-     *
-     * @return self
-     */
-    public static function fromPath($path)
-    {
-        return (new self())->setFile(new Swift_ByteStream_FileByteStream($path));
-    }
+	/**
+	 * Create a new Image from a filesystem path.
+	 *
+	 * @param string $path
+	 *
+	 * @return self
+	 */
+	public static function fromPath($path)
+	{
+		return (new self())->setFile(new Swift_ByteStream_FileByteStream($path));
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php

Indentation +522 added lines, -522 removed lines

@@ -17,526 +17,526 @@
  */
 class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 {
-    protected $signCertificate;
-    protected $signPrivateKey;
-    protected $encryptCert;
-    protected $signThenEncrypt = true;
-    protected $signLevel;
-    protected $encryptLevel;
-    protected $signOptions;
-    protected $encryptOptions;
-    protected $encryptCipher;
-    protected $extraCerts = null;
-    protected $wrapFullMessage = false;
-
-    /**
-     * @var Swift_StreamFilters_StringReplacementFilterFactory
-     */
-    protected $replacementFactory;
-
-    /**
-     * @var Swift_Mime_SimpleHeaderFactory
-     */
-    protected $headerFactory;
-
-    /**
-     * Constructor.
-     *
-     * @param string|null $signCertificate
-     * @param string|null $signPrivateKey
-     * @param string|null $encryptCertificate
-     */
-    public function __construct($signCertificate = null, $signPrivateKey = null, $encryptCertificate = null)
-    {
-        if (null !== $signPrivateKey) {
-            $this->setSignCertificate($signCertificate, $signPrivateKey);
-        }
-
-        if (null !== $encryptCertificate) {
-            $this->setEncryptCertificate($encryptCertificate);
-        }
-
-        $this->replacementFactory = Swift_DependencyContainer::getInstance()
-            ->lookup('transport.replacementfactory');
-
-        $this->signOptions = PKCS7_DETACHED;
-        $this->encryptCipher = OPENSSL_CIPHER_AES_128_CBC;
-    }
-
-    /**
-     * Set the certificate location to use for signing.
-     *
-     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
-     *
-     * @param string       $certificate
-     * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
-     * @param int          $signOptions Bitwise operator options for openssl_pkcs7_sign()
-     * @param string       $extraCerts  A file containing intermediate certificates needed by the signing certificate
-     *
-     * @return $this
-     */
-    public function setSignCertificate($certificate, $privateKey = null, $signOptions = PKCS7_DETACHED, $extraCerts = null)
-    {
-        $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
-
-        if (null !== $privateKey) {
-            if (\is_array($privateKey)) {
-                $this->signPrivateKey = $privateKey;
-                $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
-            } else {
-                $this->signPrivateKey = 'file://'.str_replace('\\', '/', realpath($privateKey));
-            }
-        }
-
-        $this->signOptions = $signOptions;
-        $this->extraCerts = $extraCerts ? realpath($extraCerts) : null;
-
-        return $this;
-    }
-
-    /**
-     * Set the certificate location to use for encryption.
-     *
-     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
-     * @see https://secure.php.net/manual/en/openssl.ciphers.php
-     *
-     * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
-     * @param int          $cipher
-     *
-     * @return $this
-     */
-    public function setEncryptCertificate($recipientCerts, $cipher = null)
-    {
-        if (\is_array($recipientCerts)) {
-            $this->encryptCert = [];
-
-            foreach ($recipientCerts as $cert) {
-                $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
-            }
-        } else {
-            $this->encryptCert = 'file://'.str_replace('\\', '/', realpath($recipientCerts));
-        }
-
-        if (null !== $cipher) {
-            $this->encryptCipher = $cipher;
-        }
-
-        return $this;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSignCertificate()
-    {
-        return $this->signCertificate;
-    }
-
-    /**
-     * @return string
-     */
-    public function getSignPrivateKey()
-    {
-        return $this->signPrivateKey;
-    }
-
-    /**
-     * Set perform signing before encryption.
-     *
-     * The default is to first sign the message and then encrypt.
-     * But some older mail clients, namely Microsoft Outlook 2000 will work when the message first encrypted.
-     * As this goes against the official specs, its recommended to only use 'encryption -> signing' when specifically targeting these 'broken' clients.
-     *
-     * @param bool $signThenEncrypt
-     *
-     * @return $this
-     */
-    public function setSignThenEncrypt($signThenEncrypt = true)
-    {
-        $this->signThenEncrypt = $signThenEncrypt;
-
-        return $this;
-    }
-
-    /**
-     * @return bool
-     */
-    public function isSignThenEncrypt()
-    {
-        return $this->signThenEncrypt;
-    }
-
-    /**
-     * Resets internal states.
-     *
-     * @return $this
-     */
-    public function reset()
-    {
-        return $this;
-    }
-
-    /**
-     * Specify whether to wrap the entire MIME message in the S/MIME message.
-     *
-     * According to RFC5751 section 3.1:
-     * In order to protect outer, non-content-related message header fields
-     * (for instance, the "Subject", "To", "From", and "Cc" fields), the
-     * sending client MAY wrap a full MIME message in a message/rfc822
-     * wrapper in order to apply S/MIME security services to these header
-     * fields.  It is up to the receiving client to decide how to present
-     * this "inner" header along with the unprotected "outer" header.
-     *
-     * @param bool $wrap
-     *
-     * @return $this
-     */
-    public function setWrapFullMessage($wrap)
-    {
-        $this->wrapFullMessage = $wrap;
-    }
-
-    /**
-     * Change the Swift_Message to apply the signing.
-     *
-     * @return $this
-     */
-    public function signMessage(Swift_Message $message)
-    {
-        if (null === $this->signCertificate && null === $this->encryptCert) {
-            return $this;
-        }
-
-        if ($this->signThenEncrypt) {
-            $this->smimeSignMessage($message);
-            $this->smimeEncryptMessage($message);
-        } else {
-            $this->smimeEncryptMessage($message);
-            $this->smimeSignMessage($message);
-        }
-    }
-
-    /**
-     * Return the list of header a signer might tamper.
-     *
-     * @return array
-     */
-    public function getAlteredHeaders()
-    {
-        return ['Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition'];
-    }
-
-    /**
-     * Sign a Swift message.
-     */
-    protected function smimeSignMessage(Swift_Message $message)
-    {
-        // If we don't have a certificate we can't sign the message
-        if (null === $this->signCertificate) {
-            return;
-        }
-
-        // Work on a clone of the original message
-        $signMessage = clone $message;
-        $signMessage->clearSigners();
-
-        if ($this->wrapFullMessage) {
-            // The original message essentially becomes the body of the new
-            // wrapped message
-            $signMessage = $this->wrapMimeMessage($signMessage);
-        } else {
-            // Only keep header needed to parse the body correctly
-            $this->clearAllHeaders($signMessage);
-            $this->copyHeaders(
-                $message,
-                $signMessage,
-                [
-                    'Content-Type',
-                    'Content-Transfer-Encoding',
-                    'Content-Disposition',
-                ]
-            );
-        }
-
-        // Copy the cloned message into a temporary file stream
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $signMessage->toByteStream($messageStream);
-        $messageStream->commit();
-        $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        // Sign the message using openssl
-        if (!openssl_pkcs7_sign(
-                $messageStream->getPath(),
-                $signedMessageStream->getPath(),
-                $this->signCertificate,
-                $this->signPrivateKey,
-                [],
-                $this->signOptions,
-                $this->extraCerts
-            )
-        ) {
-            throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
-        }
-
-        // Parse the resulting signed message content back into the Swift message
-        // preserving the original headers
-        $this->parseSSLOutput($signedMessageStream, $message);
-    }
-
-    /**
-     * Encrypt a Swift message.
-     */
-    protected function smimeEncryptMessage(Swift_Message $message)
-    {
-        // If we don't have a certificate we can't encrypt the message
-        if (null === $this->encryptCert) {
-            return;
-        }
-
-        // Work on a clone of the original message
-        $encryptMessage = clone $message;
-        $encryptMessage->clearSigners();
-
-        if ($this->wrapFullMessage) {
-            // The original message essentially becomes the body of the new
-            // wrapped message
-            $encryptMessage = $this->wrapMimeMessage($encryptMessage);
-        } else {
-            // Only keep header needed to parse the body correctly
-            $this->clearAllHeaders($encryptMessage);
-            $this->copyHeaders(
-                $message,
-                $encryptMessage,
-                [
-                    'Content-Type',
-                    'Content-Transfer-Encoding',
-                    'Content-Disposition',
-                ]
-            );
-        }
-
-        // Convert the message content (including headers) to a string
-        // and place it in a temporary file
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $encryptMessage->toByteStream($messageStream);
-        $messageStream->commit();
-        $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        // Encrypt the message
-        if (!openssl_pkcs7_encrypt(
-                $messageStream->getPath(),
-                $encryptedMessageStream->getPath(),
-                $this->encryptCert,
-                [],
-                0,
-                $this->encryptCipher
-            )
-        ) {
-            throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
-        }
-
-        // Parse the resulting signed message content back into the Swift message
-        // preserving the original headers
-        $this->parseSSLOutput($encryptedMessageStream, $message);
-    }
-
-    /**
-     * Copy named headers from one Swift message to another.
-     */
-    protected function copyHeaders(
-        Swift_Message $fromMessage,
-        Swift_Message $toMessage,
-        array $headers = []
-    ) {
-        foreach ($headers as $header) {
-            $this->copyHeader($fromMessage, $toMessage, $header);
-        }
-    }
-
-    /**
-     * Copy a single header from one Swift message to another.
-     *
-     * @param string $headerName
-     */
-    protected function copyHeader(Swift_Message $fromMessage, Swift_Message $toMessage, $headerName)
-    {
-        $header = $fromMessage->getHeaders()->get($headerName);
-        if (!$header) {
-            return;
-        }
-        $headers = $toMessage->getHeaders();
-        switch ($header->getFieldType()) {
-            case Swift_Mime_Header::TYPE_TEXT:
-                $headers->addTextHeader($header->getFieldName(), $header->getValue());
-                break;
-            case Swift_Mime_Header::TYPE_PARAMETERIZED:
-                $headers->addParameterizedHeader(
-                    $header->getFieldName(),
-                    $header->getValue(),
-                    $header->getParameters()
-                );
-                break;
-        }
-    }
-
-    /**
-     * Remove all headers from a Swift message.
-     */
-    protected function clearAllHeaders(Swift_Message $message)
-    {
-        $headers = $message->getHeaders();
-        foreach ($headers->listAll() as $header) {
-            $headers->removeAll($header);
-        }
-    }
-
-    /**
-     * Wraps a Swift_Message in a message/rfc822 MIME part.
-     *
-     * @return Swift_MimePart
-     */
-    protected function wrapMimeMessage(Swift_Message $message)
-    {
-        // Start by copying the original message into a message stream
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $message->toByteStream($messageStream);
-        $messageStream->commit();
-
-        // Create a new MIME part that wraps the original stream
-        $wrappedMessage = new Swift_MimePart($messageStream, 'message/rfc822');
-        $wrappedMessage->setEncoder(new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit'));
-
-        return $wrappedMessage;
-    }
-
-    protected function parseSSLOutput(Swift_InputByteStream $inputStream, Swift_Message $message)
-    {
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $this->copyFromOpenSSLOutput($inputStream, $messageStream);
-
-        $this->streamToMime($messageStream, $message);
-    }
-
-    /**
-     * Merges an OutputByteStream from OpenSSL to a Swift_Message.
-     */
-    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
-    {
-        // Parse the stream into headers and body
-        list($headers, $messageStream) = $this->parseStream($fromStream);
-
-        // Get the original message headers
-        $messageHeaders = $message->getHeaders();
-
-        // Let the stream determine the headers describing the body content,
-        // since the body of the original message is overwritten by the body
-        // coming from the stream.
-        // These are all content-* headers.
-
-        // Default transfer encoding is 7bit if not set
-        $encoding = '';
-        // Remove all existing transfer encoding headers
-        $messageHeaders->removeAll('Content-Transfer-Encoding');
-        // See whether the stream sets the transfer encoding
-        if (isset($headers['content-transfer-encoding'])) {
-            $encoding = $headers['content-transfer-encoding'];
-        }
-
-        // We use the null content encoder, since the body is already encoded
-        // according to the transfer encoding specified in the stream
-        $message->setEncoder(new Swift_Mime_ContentEncoder_NullContentEncoder($encoding));
-
-        // Set the disposition, if present
-        if (isset($headers['content-disposition'])) {
-            $messageHeaders->addTextHeader('Content-Disposition', $headers['content-disposition']);
-        }
-
-        // Copy over the body from the stream using the content type dictated
-        // by the stream content
-        $message->setChildren([]);
-        $message->setBody($messageStream, $headers['content-type']);
-    }
-
-    /**
-     * This message will parse the headers of a MIME email byte stream
-     * and return an array that contains the headers as an associative
-     * array and the email body as a string.
-     *
-     * @return array
-     */
-    protected function parseStream(Swift_OutputByteStream $emailStream)
-    {
-        $bufferLength = 78;
-        $headerData = '';
-        $headerBodySeparator = "\r\n\r\n";
-
-        $emailStream->setReadPointer(0);
-
-        // Read out the headers section from the stream to a string
-        while (false !== ($buffer = $emailStream->read($bufferLength))) {
-            $headerData .= $buffer;
-
-            $headersPosEnd = strpos($headerData, $headerBodySeparator);
-
-            // Stop reading if we found the end of the headers
-            if (false !== $headersPosEnd) {
-                break;
-            }
-        }
-
-        // Split the header data into lines
-        $headerData = trim(substr($headerData, 0, $headersPosEnd));
-        $headerLines = explode("\r\n", $headerData);
-        unset($headerData);
-
-        $headers = [];
-        $currentHeaderName = '';
-
-        // Transform header lines into an associative array
-        foreach ($headerLines as $headerLine) {
-            // Handle headers that span multiple lines
-            if (false === strpos($headerLine, ':')) {
-                $headers[$currentHeaderName] .= ' '.trim($headerLine ?? '');
-                continue;
-            }
-
-            $header = explode(':', $headerLine, 2);
-            $currentHeaderName = strtolower($header[0] ?? '');
-            $headers[$currentHeaderName] = trim($header[1] ?? '');
-        }
-
-        // Read the entire email body into a byte stream
-        $bodyStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        // Skip the header and separator and point to the body
-        $emailStream->setReadPointer($headersPosEnd + \strlen($headerBodySeparator));
-
-        while (false !== ($buffer = $emailStream->read($bufferLength))) {
-            $bodyStream->write($buffer);
-        }
-
-        $bodyStream->commit();
-
-        return [$headers, $bodyStream];
-    }
-
-    protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
-    {
-        $bufferLength = 4096;
-        $filteredStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $filteredStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
-        $filteredStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
-
-        while (false !== ($buffer = $fromStream->read($bufferLength))) {
-            $filteredStream->write($buffer);
-        }
-
-        $filteredStream->flushBuffers();
-
-        while (false !== ($buffer = $filteredStream->read($bufferLength))) {
-            $toStream->write($buffer);
-        }
-
-        $toStream->commit();
-    }
+	protected $signCertificate;
+	protected $signPrivateKey;
+	protected $encryptCert;
+	protected $signThenEncrypt = true;
+	protected $signLevel;
+	protected $encryptLevel;
+	protected $signOptions;
+	protected $encryptOptions;
+	protected $encryptCipher;
+	protected $extraCerts = null;
+	protected $wrapFullMessage = false;
+
+	/**
+	 * @var Swift_StreamFilters_StringReplacementFilterFactory
+	 */
+	protected $replacementFactory;
+
+	/**
+	 * @var Swift_Mime_SimpleHeaderFactory
+	 */
+	protected $headerFactory;
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string|null $signCertificate
+	 * @param string|null $signPrivateKey
+	 * @param string|null $encryptCertificate
+	 */
+	public function __construct($signCertificate = null, $signPrivateKey = null, $encryptCertificate = null)
+	{
+		if (null !== $signPrivateKey) {
+			$this->setSignCertificate($signCertificate, $signPrivateKey);
+		}
+
+		if (null !== $encryptCertificate) {
+			$this->setEncryptCertificate($encryptCertificate);
+		}
+
+		$this->replacementFactory = Swift_DependencyContainer::getInstance()
+			->lookup('transport.replacementfactory');
+
+		$this->signOptions = PKCS7_DETACHED;
+		$this->encryptCipher = OPENSSL_CIPHER_AES_128_CBC;
+	}
+
+	/**
+	 * Set the certificate location to use for signing.
+	 *
+	 * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
+	 *
+	 * @param string       $certificate
+	 * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
+	 * @param int          $signOptions Bitwise operator options for openssl_pkcs7_sign()
+	 * @param string       $extraCerts  A file containing intermediate certificates needed by the signing certificate
+	 *
+	 * @return $this
+	 */
+	public function setSignCertificate($certificate, $privateKey = null, $signOptions = PKCS7_DETACHED, $extraCerts = null)
+	{
+		$this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
+
+		if (null !== $privateKey) {
+			if (\is_array($privateKey)) {
+				$this->signPrivateKey = $privateKey;
+				$this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
+			} else {
+				$this->signPrivateKey = 'file://'.str_replace('\\', '/', realpath($privateKey));
+			}
+		}
+
+		$this->signOptions = $signOptions;
+		$this->extraCerts = $extraCerts ? realpath($extraCerts) : null;
+
+		return $this;
+	}
+
+	/**
+	 * Set the certificate location to use for encryption.
+	 *
+	 * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
+	 * @see https://secure.php.net/manual/en/openssl.ciphers.php
+	 *
+	 * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
+	 * @param int          $cipher
+	 *
+	 * @return $this
+	 */
+	public function setEncryptCertificate($recipientCerts, $cipher = null)
+	{
+		if (\is_array($recipientCerts)) {
+			$this->encryptCert = [];
+
+			foreach ($recipientCerts as $cert) {
+				$this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
+			}
+		} else {
+			$this->encryptCert = 'file://'.str_replace('\\', '/', realpath($recipientCerts));
+		}
+
+		if (null !== $cipher) {
+			$this->encryptCipher = $cipher;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSignCertificate()
+	{
+		return $this->signCertificate;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getSignPrivateKey()
+	{
+		return $this->signPrivateKey;
+	}
+
+	/**
+	 * Set perform signing before encryption.
+	 *
+	 * The default is to first sign the message and then encrypt.
+	 * But some older mail clients, namely Microsoft Outlook 2000 will work when the message first encrypted.
+	 * As this goes against the official specs, its recommended to only use 'encryption -> signing' when specifically targeting these 'broken' clients.
+	 *
+	 * @param bool $signThenEncrypt
+	 *
+	 * @return $this
+	 */
+	public function setSignThenEncrypt($signThenEncrypt = true)
+	{
+		$this->signThenEncrypt = $signThenEncrypt;
+
+		return $this;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function isSignThenEncrypt()
+	{
+		return $this->signThenEncrypt;
+	}
+
+	/**
+	 * Resets internal states.
+	 *
+	 * @return $this
+	 */
+	public function reset()
+	{
+		return $this;
+	}
+
+	/**
+	 * Specify whether to wrap the entire MIME message in the S/MIME message.
+	 *
+	 * According to RFC5751 section 3.1:
+	 * In order to protect outer, non-content-related message header fields
+	 * (for instance, the "Subject", "To", "From", and "Cc" fields), the
+	 * sending client MAY wrap a full MIME message in a message/rfc822
+	 * wrapper in order to apply S/MIME security services to these header
+	 * fields.  It is up to the receiving client to decide how to present
+	 * this "inner" header along with the unprotected "outer" header.
+	 *
+	 * @param bool $wrap
+	 *
+	 * @return $this
+	 */
+	public function setWrapFullMessage($wrap)
+	{
+		$this->wrapFullMessage = $wrap;
+	}
+
+	/**
+	 * Change the Swift_Message to apply the signing.
+	 *
+	 * @return $this
+	 */
+	public function signMessage(Swift_Message $message)
+	{
+		if (null === $this->signCertificate && null === $this->encryptCert) {
+			return $this;
+		}
+
+		if ($this->signThenEncrypt) {
+			$this->smimeSignMessage($message);
+			$this->smimeEncryptMessage($message);
+		} else {
+			$this->smimeEncryptMessage($message);
+			$this->smimeSignMessage($message);
+		}
+	}
+
+	/**
+	 * Return the list of header a signer might tamper.
+	 *
+	 * @return array
+	 */
+	public function getAlteredHeaders()
+	{
+		return ['Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition'];
+	}
+
+	/**
+	 * Sign a Swift message.
+	 */
+	protected function smimeSignMessage(Swift_Message $message)
+	{
+		// If we don't have a certificate we can't sign the message
+		if (null === $this->signCertificate) {
+			return;
+		}
+
+		// Work on a clone of the original message
+		$signMessage = clone $message;
+		$signMessage->clearSigners();
+
+		if ($this->wrapFullMessage) {
+			// The original message essentially becomes the body of the new
+			// wrapped message
+			$signMessage = $this->wrapMimeMessage($signMessage);
+		} else {
+			// Only keep header needed to parse the body correctly
+			$this->clearAllHeaders($signMessage);
+			$this->copyHeaders(
+				$message,
+				$signMessage,
+				[
+					'Content-Type',
+					'Content-Transfer-Encoding',
+					'Content-Disposition',
+				]
+			);
+		}
+
+		// Copy the cloned message into a temporary file stream
+		$messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+		$signMessage->toByteStream($messageStream);
+		$messageStream->commit();
+		$signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+		// Sign the message using openssl
+		if (!openssl_pkcs7_sign(
+				$messageStream->getPath(),
+				$signedMessageStream->getPath(),
+				$this->signCertificate,
+				$this->signPrivateKey,
+				[],
+				$this->signOptions,
+				$this->extraCerts
+			)
+		) {
+			throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
+		}
+
+		// Parse the resulting signed message content back into the Swift message
+		// preserving the original headers
+		$this->parseSSLOutput($signedMessageStream, $message);
+	}
+
+	/**
+	 * Encrypt a Swift message.
+	 */
+	protected function smimeEncryptMessage(Swift_Message $message)
+	{
+		// If we don't have a certificate we can't encrypt the message
+		if (null === $this->encryptCert) {
+			return;
+		}
+
+		// Work on a clone of the original message
+		$encryptMessage = clone $message;
+		$encryptMessage->clearSigners();
+
+		if ($this->wrapFullMessage) {
+			// The original message essentially becomes the body of the new
+			// wrapped message
+			$encryptMessage = $this->wrapMimeMessage($encryptMessage);
+		} else {
+			// Only keep header needed to parse the body correctly
+			$this->clearAllHeaders($encryptMessage);
+			$this->copyHeaders(
+				$message,
+				$encryptMessage,
+				[
+					'Content-Type',
+					'Content-Transfer-Encoding',
+					'Content-Disposition',
+				]
+			);
+		}
+
+		// Convert the message content (including headers) to a string
+		// and place it in a temporary file
+		$messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+		$encryptMessage->toByteStream($messageStream);
+		$messageStream->commit();
+		$encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+		// Encrypt the message
+		if (!openssl_pkcs7_encrypt(
+				$messageStream->getPath(),
+				$encryptedMessageStream->getPath(),
+				$this->encryptCert,
+				[],
+				0,
+				$this->encryptCipher
+			)
+		) {
+			throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
+		}
+
+		// Parse the resulting signed message content back into the Swift message
+		// preserving the original headers
+		$this->parseSSLOutput($encryptedMessageStream, $message);
+	}
+
+	/**
+	 * Copy named headers from one Swift message to another.
+	 */
+	protected function copyHeaders(
+		Swift_Message $fromMessage,
+		Swift_Message $toMessage,
+		array $headers = []
+	) {
+		foreach ($headers as $header) {
+			$this->copyHeader($fromMessage, $toMessage, $header);
+		}
+	}
+
+	/**
+	 * Copy a single header from one Swift message to another.
+	 *
+	 * @param string $headerName
+	 */
+	protected function copyHeader(Swift_Message $fromMessage, Swift_Message $toMessage, $headerName)
+	{
+		$header = $fromMessage->getHeaders()->get($headerName);
+		if (!$header) {
+			return;
+		}
+		$headers = $toMessage->getHeaders();
+		switch ($header->getFieldType()) {
+			case Swift_Mime_Header::TYPE_TEXT:
+				$headers->addTextHeader($header->getFieldName(), $header->getValue());
+				break;
+			case Swift_Mime_Header::TYPE_PARAMETERIZED:
+				$headers->addParameterizedHeader(
+					$header->getFieldName(),
+					$header->getValue(),
+					$header->getParameters()
+				);
+				break;
+		}
+	}
+
+	/**
+	 * Remove all headers from a Swift message.
+	 */
+	protected function clearAllHeaders(Swift_Message $message)
+	{
+		$headers = $message->getHeaders();
+		foreach ($headers->listAll() as $header) {
+			$headers->removeAll($header);
+		}
+	}
+
+	/**
+	 * Wraps a Swift_Message in a message/rfc822 MIME part.
+	 *
+	 * @return Swift_MimePart
+	 */
+	protected function wrapMimeMessage(Swift_Message $message)
+	{
+		// Start by copying the original message into a message stream
+		$messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+		$message->toByteStream($messageStream);
+		$messageStream->commit();
+
+		// Create a new MIME part that wraps the original stream
+		$wrappedMessage = new Swift_MimePart($messageStream, 'message/rfc822');
+		$wrappedMessage->setEncoder(new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit'));
+
+		return $wrappedMessage;
+	}
+
+	protected function parseSSLOutput(Swift_InputByteStream $inputStream, Swift_Message $message)
+	{
+		$messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+		$this->copyFromOpenSSLOutput($inputStream, $messageStream);
+
+		$this->streamToMime($messageStream, $message);
+	}
+
+	/**
+	 * Merges an OutputByteStream from OpenSSL to a Swift_Message.
+	 */
+	protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
+	{
+		// Parse the stream into headers and body
+		list($headers, $messageStream) = $this->parseStream($fromStream);
+
+		// Get the original message headers
+		$messageHeaders = $message->getHeaders();
+
+		// Let the stream determine the headers describing the body content,
+		// since the body of the original message is overwritten by the body
+		// coming from the stream.
+		// These are all content-* headers.
+
+		// Default transfer encoding is 7bit if not set
+		$encoding = '';
+		// Remove all existing transfer encoding headers
+		$messageHeaders->removeAll('Content-Transfer-Encoding');
+		// See whether the stream sets the transfer encoding
+		if (isset($headers['content-transfer-encoding'])) {
+			$encoding = $headers['content-transfer-encoding'];
+		}
+
+		// We use the null content encoder, since the body is already encoded
+		// according to the transfer encoding specified in the stream
+		$message->setEncoder(new Swift_Mime_ContentEncoder_NullContentEncoder($encoding));
+
+		// Set the disposition, if present
+		if (isset($headers['content-disposition'])) {
+			$messageHeaders->addTextHeader('Content-Disposition', $headers['content-disposition']);
+		}
+
+		// Copy over the body from the stream using the content type dictated
+		// by the stream content
+		$message->setChildren([]);
+		$message->setBody($messageStream, $headers['content-type']);
+	}
+
+	/**
+	 * This message will parse the headers of a MIME email byte stream
+	 * and return an array that contains the headers as an associative
+	 * array and the email body as a string.
+	 *
+	 * @return array
+	 */
+	protected function parseStream(Swift_OutputByteStream $emailStream)
+	{
+		$bufferLength = 78;
+		$headerData = '';
+		$headerBodySeparator = "\r\n\r\n";
+
+		$emailStream->setReadPointer(0);
+
+		// Read out the headers section from the stream to a string
+		while (false !== ($buffer = $emailStream->read($bufferLength))) {
+			$headerData .= $buffer;
+
+			$headersPosEnd = strpos($headerData, $headerBodySeparator);
+
+			// Stop reading if we found the end of the headers
+			if (false !== $headersPosEnd) {
+				break;
+			}
+		}
+
+		// Split the header data into lines
+		$headerData = trim(substr($headerData, 0, $headersPosEnd));
+		$headerLines = explode("\r\n", $headerData);
+		unset($headerData);
+
+		$headers = [];
+		$currentHeaderName = '';
+
+		// Transform header lines into an associative array
+		foreach ($headerLines as $headerLine) {
+			// Handle headers that span multiple lines
+			if (false === strpos($headerLine, ':')) {
+				$headers[$currentHeaderName] .= ' '.trim($headerLine ?? '');
+				continue;
+			}
+
+			$header = explode(':', $headerLine, 2);
+			$currentHeaderName = strtolower($header[0] ?? '');
+			$headers[$currentHeaderName] = trim($header[1] ?? '');
+		}
+
+		// Read the entire email body into a byte stream
+		$bodyStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+		// Skip the header and separator and point to the body
+		$emailStream->setReadPointer($headersPosEnd + \strlen($headerBodySeparator));
+
+		while (false !== ($buffer = $emailStream->read($bufferLength))) {
+			$bodyStream->write($buffer);
+		}
+
+		$bodyStream->commit();
+
+		return [$headers, $bodyStream];
+	}
+
+	protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
+	{
+		$bufferLength = 4096;
+		$filteredStream = new Swift_ByteStream_TemporaryFileByteStream();
+		$filteredStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
+		$filteredStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
+
+		while (false !== ($buffer = $fromStream->read($bufferLength))) {
+			$filteredStream->write($buffer);
+		}
+
+		$filteredStream->flushBuffers();
+
+		while (false !== ($buffer = $filteredStream->read($bufferLength))) {
+			$toStream->write($buffer);
+		}
+
+		$toStream->commit();
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php

Indentation +664 added lines, -664 removed lines

@@ -15,668 +15,668 @@
  */
 class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 {
-    /**
-     * PrivateKey.
-     *
-     * @var string
-     */
-    protected $privateKey;
-
-    /**
-     * DomainName.
-     *
-     * @var string
-     */
-    protected $domainName;
-
-    /**
-     * Selector.
-     *
-     * @var string
-     */
-    protected $selector;
-
-    private $passphrase = '';
-
-    /**
-     * Hash algorithm used.
-     *
-     * @see RFC6376 3.3: Signers MUST implement and SHOULD sign using rsa-sha256.
-     *
-     * @var string
-     */
-    protected $hashAlgorithm = 'rsa-sha256';
-
-    /**
-     * Body canon method.
-     *
-     * @var string
-     */
-    protected $bodyCanon = 'simple';
-
-    /**
-     * Header canon method.
-     *
-     * @var string
-     */
-    protected $headerCanon = 'simple';
-
-    /**
-     * Headers not being signed.
-     *
-     * @var array
-     */
-    protected $ignoredHeaders = ['return-path' => true];
-
-    /**
-     * Signer identity.
-     *
-     * @var string
-     */
-    protected $signerIdentity;
-
-    /**
-     * BodyLength.
-     *
-     * @var int
-     */
-    protected $bodyLen = 0;
-
-    /**
-     * Maximum signedLen.
-     *
-     * @var int
-     */
-    protected $maxLen = PHP_INT_MAX;
-
-    /**
-     * Embbed bodyLen in signature.
-     *
-     * @var bool
-     */
-    protected $showLen = false;
-
-    /**
-     * When the signature has been applied (true means time()), false means not embedded.
-     *
-     * @var mixed
-     */
-    protected $signatureTimestamp = true;
-
-    /**
-     * When will the signature expires false means not embedded, if sigTimestamp is auto
-     * Expiration is relative, otherwise it's absolute.
-     *
-     * @var int
-     */
-    protected $signatureExpiration = false;
-
-    /**
-     * Must we embed signed headers?
-     *
-     * @var bool
-     */
-    protected $debugHeaders = false;
-
-    // work variables
-    /**
-     * Headers used to generate hash.
-     *
-     * @var array
-     */
-    protected $signedHeaders = [];
-
-    /**
-     * If debugHeaders is set store debugData here.
-     *
-     * @var string[]
-     */
-    private $debugHeadersData = [];
-
-    /**
-     * Stores the bodyHash.
-     *
-     * @var string
-     */
-    private $bodyHash = '';
-
-    /**
-     * Stores the signature header.
-     *
-     * @var Swift_Mime_Headers_ParameterizedHeader
-     */
-    protected $dkimHeader;
-
-    private $bodyHashHandler;
-
-    private $headerHash;
-
-    private $headerCanonData = '';
-
-    private $bodyCanonEmptyCounter = 0;
-
-    private $bodyCanonIgnoreStart = 2;
-
-    private $bodyCanonSpace = false;
-
-    private $bodyCanonLastChar = null;
-
-    private $bodyCanonLine = '';
-
-    private $bound = [];
-
-    /**
-     * Constructor.
-     *
-     * @param string $privateKey
-     * @param string $domainName
-     * @param string $selector
-     * @param string $passphrase
-     */
-    public function __construct($privateKey, $domainName, $selector, $passphrase = '')
-    {
-        $this->privateKey = $privateKey;
-        $this->domainName = $domainName;
-        $this->signerIdentity = '@'.$domainName;
-        $this->selector = $selector;
-        $this->passphrase = $passphrase;
-    }
-
-    /**
-     * Reset the Signer.
-     *
-     * @see Swift_Signer::reset()
-     */
-    public function reset()
-    {
-        $this->headerHash = null;
-        $this->signedHeaders = [];
-        $this->bodyHash = null;
-        $this->bodyHashHandler = null;
-        $this->bodyCanonIgnoreStart = 2;
-        $this->bodyCanonEmptyCounter = 0;
-        $this->bodyCanonLastChar = null;
-        $this->bodyCanonSpace = false;
-    }
-
-    /**
-     * Writes $bytes to the end of the stream.
-     *
-     * Writing may not happen immediately if the stream chooses to buffer.  If
-     * you want to write these bytes with immediate effect, call {@link commit()}
-     * after calling write().
-     *
-     * This method returns the sequence ID of the write (i.e. 1 for first, 2 for
-     * second, etc etc).
-     *
-     * @param string $bytes
-     *
-     * @return int
-     *
-     * @throws Swift_IoException
-     */
-    // TODO fix return
-    public function write($bytes)
-    {
-        $this->canonicalizeBody($bytes);
-        foreach ($this->bound as $is) {
-            $is->write($bytes);
-        }
-    }
-
-    /**
-     * For any bytes that are currently buffered inside the stream, force them
-     * off the buffer.
-     */
-    public function commit()
-    {
-        // Nothing to do
-        return;
-    }
-
-    /**
-     * Attach $is to this stream.
-     *
-     * The stream acts as an observer, receiving all data that is written.
-     * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     */
-    public function bind(Swift_InputByteStream $is)
-    {
-        // Don't have to mirror anything
-        $this->bound[] = $is;
-
-        return;
-    }
-
-    /**
-     * Remove an already bound stream.
-     *
-     * If $is is not bound, no errors will be raised.
-     * If the stream currently has any buffered data it will be written to $is
-     * before unbinding occurs.
-     */
-    public function unbind(Swift_InputByteStream $is)
-    {
-        // Don't have to mirror anything
-        foreach ($this->bound as $k => $stream) {
-            if ($stream === $is) {
-                unset($this->bound[$k]);
-
-                return;
-            }
-        }
-    }
-
-    /**
-     * Flush the contents of the stream (empty it) and set the internal pointer
-     * to the beginning.
-     *
-     * @throws Swift_IoException
-     */
-    public function flushBuffers()
-    {
-        $this->reset();
-    }
-
-    /**
-     * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1.
-     *
-     * @param string $hash 'rsa-sha1' or 'rsa-sha256'
-     *
-     * @throws Swift_SwiftException
-     *
-     * @return $this
-     */
-    public function setHashAlgorithm($hash)
-    {
-        switch ($hash) {
-            case 'rsa-sha1':
-                $this->hashAlgorithm = 'rsa-sha1';
-                break;
-            case 'rsa-sha256':
-                $this->hashAlgorithm = 'rsa-sha256';
-                if (!\defined('OPENSSL_ALGO_SHA256')) {
-                    throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
-                }
-                break;
-            default:
-                throw new Swift_SwiftException('Unable to set the hash algorithm, must be one of rsa-sha1 or rsa-sha256 (%s given).', $hash);
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the body canonicalization algorithm.
-     *
-     * @param string $canon
-     *
-     * @return $this
-     */
-    public function setBodyCanon($canon)
-    {
-        if ('relaxed' == $canon) {
-            $this->bodyCanon = 'relaxed';
-        } else {
-            $this->bodyCanon = 'simple';
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the header canonicalization algorithm.
-     *
-     * @param string $canon
-     *
-     * @return $this
-     */
-    public function setHeaderCanon($canon)
-    {
-        if ('relaxed' == $canon) {
-            $this->headerCanon = 'relaxed';
-        } else {
-            $this->headerCanon = 'simple';
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the signer identity.
-     *
-     * @param string $identity
-     *
-     * @return $this
-     */
-    public function setSignerIdentity($identity)
-    {
-        $this->signerIdentity = $identity;
-
-        return $this;
-    }
-
-    /**
-     * Set the length of the body to sign.
-     *
-     * @param mixed $len (bool or int)
-     *
-     * @return $this
-     */
-    public function setBodySignedLen($len)
-    {
-        if (true === $len) {
-            $this->showLen = true;
-            $this->maxLen = PHP_INT_MAX;
-        } elseif (false === $len) {
-            $this->showLen = false;
-            $this->maxLen = PHP_INT_MAX;
-        } else {
-            $this->showLen = true;
-            $this->maxLen = (int) $len;
-        }
-
-        return $this;
-    }
-
-    /**
-     * Set the signature timestamp.
-     *
-     * @param int $time A timestamp
-     *
-     * @return $this
-     */
-    public function setSignatureTimestamp($time)
-    {
-        $this->signatureTimestamp = $time;
-
-        return $this;
-    }
-
-    /**
-     * Set the signature expiration timestamp.
-     *
-     * @param int $time A timestamp
-     *
-     * @return $this
-     */
-    public function setSignatureExpiration($time)
-    {
-        $this->signatureExpiration = $time;
-
-        return $this;
-    }
-
-    /**
-     * Enable / disable the DebugHeaders.
-     *
-     * @param bool $debug
-     *
-     * @return Swift_Signers_DKIMSigner
-     */
-    public function setDebugHeaders($debug)
-    {
-        $this->debugHeaders = (bool) $debug;
-
-        return $this;
-    }
-
-    /**
-     * Start Body.
-     */
-    public function startBody()
-    {
-        // Init
-        switch ($this->hashAlgorithm) {
-            case 'rsa-sha256':
-                $this->bodyHashHandler = hash_init('sha256');
-                break;
-            case 'rsa-sha1':
-                $this->bodyHashHandler = hash_init('sha1');
-                break;
-        }
-        $this->bodyCanonLine = '';
-    }
-
-    /**
-     * End Body.
-     */
-    public function endBody()
-    {
-        $this->endOfBody();
-    }
-
-    /**
-     * Returns the list of Headers Tampered by this plugin.
-     *
-     * @return array
-     */
-    public function getAlteredHeaders()
-    {
-        if ($this->debugHeaders) {
-            return ['DKIM-Signature', 'X-DebugHash'];
-        } else {
-            return ['DKIM-Signature'];
-        }
-    }
-
-    /**
-     * Adds an ignored Header.
-     *
-     * @param string $header_name
-     *
-     * @return Swift_Signers_DKIMSigner
-     */
-    public function ignoreHeader($header_name)
-    {
-        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
-
-        return $this;
-    }
-
-    /**
-     * Set the headers to sign.
-     *
-     * @return Swift_Signers_DKIMSigner
-     */
-    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
-    {
-        $this->headerCanonData = '';
-        // Loop through Headers
-        $listHeaders = $headers->listAll();
-        foreach ($listHeaders as $hName) {
-            // Check if we need to ignore Header
-            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
-                if ($headers->has($hName)) {
-                    $tmp = $headers->getAll($hName);
-                    foreach ($tmp as $header) {
-                        if ('' != $header->getFieldBody()) {
-                            $this->addHeader($header->toString());
-                            $this->signedHeaders[] = $header->getFieldName();
-                        }
-                    }
-                }
-            }
-        }
-
-        return $this;
-    }
-
-    /**
-     * Add the signature to the given Headers.
-     *
-     * @return Swift_Signers_DKIMSigner
-     */
-    public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
-    {
-        // Prepare the DKIM-Signature
-        $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
-        if ('simple' != $this->bodyCanon) {
-            $params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
-        } elseif ('simple' != $this->headerCanon) {
-            $params['c'] = $this->headerCanon;
-        }
-        if ($this->showLen) {
-            $params['l'] = $this->bodyLen;
-        }
-        if (true === $this->signatureTimestamp) {
-            $params['t'] = time();
-            if (false !== $this->signatureExpiration) {
-                $params['x'] = $params['t'] + $this->signatureExpiration;
-            }
-        } else {
-            if (false !== $this->signatureTimestamp) {
-                $params['t'] = $this->signatureTimestamp;
-            }
-            if (false !== $this->signatureExpiration) {
-                $params['x'] = $this->signatureExpiration;
-            }
-        }
-        if ($this->debugHeaders) {
-            $params['z'] = implode('|', $this->debugHeadersData);
-        }
-        $string = '';
-        foreach ($params as $k => $v) {
-            $string .= $k.'='.$v.'; ';
-        }
-        $string = trim($string);
-        $headers->addTextHeader('DKIM-Signature', $string);
-        // Add the last DKIM-Signature
-        $tmp = $headers->getAll('DKIM-Signature');
-        $this->dkimHeader = end($tmp);
-        $this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true);
-        if ($this->debugHeaders) {
-            $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? ''));
-        }
-        $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' ')));
-
-        return $this;
-    }
-
-    /* Private helpers */
-
-    protected function addHeader($header, $is_sig = false)
-    {
-        switch ($this->headerCanon) {
-            case 'relaxed':
-                // Prepare Header and cascade
-                $exploded = explode(':', $header, 2);
-                $name = strtolower(trim($exploded[0]));
-                $value = str_replace("\r\n", '', $exploded[1]);
-                $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
-                $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
-                // no break
-            case 'simple':
-                // Nothing to do
-        }
-        $this->addToHeaderHash($header);
-    }
-
-    protected function canonicalizeBody($string)
-    {
-        $len = \strlen($string);
-        $canon = '';
-        $method = ('relaxed' == $this->bodyCanon);
-        for ($i = 0; $i < $len; ++$i) {
-            if ($this->bodyCanonIgnoreStart > 0) {
-                --$this->bodyCanonIgnoreStart;
-                continue;
-            }
-            switch ($string[$i]) {
-                case "\r":
-                    $this->bodyCanonLastChar = "\r";
-                    break;
-                case "\n":
-                    if ("\r" == $this->bodyCanonLastChar) {
-                        if ($method) {
-                            $this->bodyCanonSpace = false;
-                        }
-                        if ('' == $this->bodyCanonLine) {
-                            ++$this->bodyCanonEmptyCounter;
-                        } else {
-                            $this->bodyCanonLine = '';
-                            $canon .= "\r\n";
-                        }
-                    } else {
-                        // Wooops Error
-                        // todo handle it but should never happen
-                    }
-                    break;
-                case ' ':
-                case "\t":
-                    if ($method) {
-                        $this->bodyCanonSpace = true;
-                        break;
-                    }
-                    // no break
-                default:
-                    if ($this->bodyCanonEmptyCounter > 0) {
-                        $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
-                        $this->bodyCanonEmptyCounter = 0;
-                    }
-                    if ($this->bodyCanonSpace) {
-                        $this->bodyCanonLine .= ' ';
-                        $canon .= ' ';
-                        $this->bodyCanonSpace = false;
-                    }
-                    $this->bodyCanonLine .= $string[$i];
-                    $canon .= $string[$i];
-            }
-        }
-        $this->addToBodyHash($canon);
-    }
-
-    protected function endOfBody()
-    {
-        // Add trailing Line return if last line is non empty
-        if (\strlen($this->bodyCanonLine) > 0) {
-            $this->addToBodyHash("\r\n");
-        }
-        $this->bodyHash = hash_final($this->bodyHashHandler, true);
-    }
-
-    private function addToBodyHash($string)
-    {
-        $len = \strlen($string);
-        if ($len > ($new_len = ($this->maxLen - $this->bodyLen))) {
-            $string = substr($string, 0, $new_len);
-            $len = $new_len;
-        }
-        hash_update($this->bodyHashHandler, $string);
-        $this->bodyLen += $len;
-    }
-
-    private function addToHeaderHash($header)
-    {
-        if ($this->debugHeaders) {
-            $this->debugHeadersData[] = trim($header ?? '');
-        }
-        $this->headerCanonData .= $header;
-    }
-
-    /**
-     * @throws Swift_SwiftException
-     *
-     * @return string
-     */
-    private function getEncryptedHash()
-    {
-        $signature = '';
-        switch ($this->hashAlgorithm) {
-            case 'rsa-sha1':
-                $algorithm = OPENSSL_ALGO_SHA1;
-                break;
-            case 'rsa-sha256':
-                $algorithm = OPENSSL_ALGO_SHA256;
-                break;
-        }
-        $pkeyId = openssl_get_privatekey($this->privateKey, $this->passphrase);
-        if (!$pkeyId) {
-            throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
-        }
-        if (openssl_sign($this->headerCanonData, $signature, $pkeyId, $algorithm)) {
-            return $signature;
-        }
-        throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
-    }
+	/**
+	 * PrivateKey.
+	 *
+	 * @var string
+	 */
+	protected $privateKey;
+
+	/**
+	 * DomainName.
+	 *
+	 * @var string
+	 */
+	protected $domainName;
+
+	/**
+	 * Selector.
+	 *
+	 * @var string
+	 */
+	protected $selector;
+
+	private $passphrase = '';
+
+	/**
+	 * Hash algorithm used.
+	 *
+	 * @see RFC6376 3.3: Signers MUST implement and SHOULD sign using rsa-sha256.
+	 *
+	 * @var string
+	 */
+	protected $hashAlgorithm = 'rsa-sha256';
+
+	/**
+	 * Body canon method.
+	 *
+	 * @var string
+	 */
+	protected $bodyCanon = 'simple';
+
+	/**
+	 * Header canon method.
+	 *
+	 * @var string
+	 */
+	protected $headerCanon = 'simple';
+
+	/**
+	 * Headers not being signed.
+	 *
+	 * @var array
+	 */
+	protected $ignoredHeaders = ['return-path' => true];
+
+	/**
+	 * Signer identity.
+	 *
+	 * @var string
+	 */
+	protected $signerIdentity;
+
+	/**
+	 * BodyLength.
+	 *
+	 * @var int
+	 */
+	protected $bodyLen = 0;
+
+	/**
+	 * Maximum signedLen.
+	 *
+	 * @var int
+	 */
+	protected $maxLen = PHP_INT_MAX;
+
+	/**
+	 * Embbed bodyLen in signature.
+	 *
+	 * @var bool
+	 */
+	protected $showLen = false;
+
+	/**
+	 * When the signature has been applied (true means time()), false means not embedded.
+	 *
+	 * @var mixed
+	 */
+	protected $signatureTimestamp = true;
+
+	/**
+	 * When will the signature expires false means not embedded, if sigTimestamp is auto
+	 * Expiration is relative, otherwise it's absolute.
+	 *
+	 * @var int
+	 */
+	protected $signatureExpiration = false;
+
+	/**
+	 * Must we embed signed headers?
+	 *
+	 * @var bool
+	 */
+	protected $debugHeaders = false;
+
+	// work variables
+	/**
+	 * Headers used to generate hash.
+	 *
+	 * @var array
+	 */
+	protected $signedHeaders = [];
+
+	/**
+	 * If debugHeaders is set store debugData here.
+	 *
+	 * @var string[]
+	 */
+	private $debugHeadersData = [];
+
+	/**
+	 * Stores the bodyHash.
+	 *
+	 * @var string
+	 */
+	private $bodyHash = '';
+
+	/**
+	 * Stores the signature header.
+	 *
+	 * @var Swift_Mime_Headers_ParameterizedHeader
+	 */
+	protected $dkimHeader;
+
+	private $bodyHashHandler;
+
+	private $headerHash;
+
+	private $headerCanonData = '';
+
+	private $bodyCanonEmptyCounter = 0;
+
+	private $bodyCanonIgnoreStart = 2;
+
+	private $bodyCanonSpace = false;
+
+	private $bodyCanonLastChar = null;
+
+	private $bodyCanonLine = '';
+
+	private $bound = [];
+
+	/**
+	 * Constructor.
+	 *
+	 * @param string $privateKey
+	 * @param string $domainName
+	 * @param string $selector
+	 * @param string $passphrase
+	 */
+	public function __construct($privateKey, $domainName, $selector, $passphrase = '')
+	{
+		$this->privateKey = $privateKey;
+		$this->domainName = $domainName;
+		$this->signerIdentity = '@'.$domainName;
+		$this->selector = $selector;
+		$this->passphrase = $passphrase;
+	}
+
+	/**
+	 * Reset the Signer.
+	 *
+	 * @see Swift_Signer::reset()
+	 */
+	public function reset()
+	{
+		$this->headerHash = null;
+		$this->signedHeaders = [];
+		$this->bodyHash = null;
+		$this->bodyHashHandler = null;
+		$this->bodyCanonIgnoreStart = 2;
+		$this->bodyCanonEmptyCounter = 0;
+		$this->bodyCanonLastChar = null;
+		$this->bodyCanonSpace = false;
+	}
+
+	/**
+	 * Writes $bytes to the end of the stream.
+	 *
+	 * Writing may not happen immediately if the stream chooses to buffer.  If
+	 * you want to write these bytes with immediate effect, call {@link commit()}
+	 * after calling write().
+	 *
+	 * This method returns the sequence ID of the write (i.e. 1 for first, 2 for
+	 * second, etc etc).
+	 *
+	 * @param string $bytes
+	 *
+	 * @return int
+	 *
+	 * @throws Swift_IoException
+	 */
+	// TODO fix return
+	public function write($bytes)
+	{
+		$this->canonicalizeBody($bytes);
+		foreach ($this->bound as $is) {
+			$is->write($bytes);
+		}
+	}
+
+	/**
+	 * For any bytes that are currently buffered inside the stream, force them
+	 * off the buffer.
+	 */
+	public function commit()
+	{
+		// Nothing to do
+		return;
+	}
+
+	/**
+	 * Attach $is to this stream.
+	 *
+	 * The stream acts as an observer, receiving all data that is written.
+	 * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
+	 */
+	public function bind(Swift_InputByteStream $is)
+	{
+		// Don't have to mirror anything
+		$this->bound[] = $is;
+
+		return;
+	}
+
+	/**
+	 * Remove an already bound stream.
+	 *
+	 * If $is is not bound, no errors will be raised.
+	 * If the stream currently has any buffered data it will be written to $is
+	 * before unbinding occurs.
+	 */
+	public function unbind(Swift_InputByteStream $is)
+	{
+		// Don't have to mirror anything
+		foreach ($this->bound as $k => $stream) {
+			if ($stream === $is) {
+				unset($this->bound[$k]);
+
+				return;
+			}
+		}
+	}
+
+	/**
+	 * Flush the contents of the stream (empty it) and set the internal pointer
+	 * to the beginning.
+	 *
+	 * @throws Swift_IoException
+	 */
+	public function flushBuffers()
+	{
+		$this->reset();
+	}
+
+	/**
+	 * Set hash_algorithm, must be one of rsa-sha256 | rsa-sha1.
+	 *
+	 * @param string $hash 'rsa-sha1' or 'rsa-sha256'
+	 *
+	 * @throws Swift_SwiftException
+	 *
+	 * @return $this
+	 */
+	public function setHashAlgorithm($hash)
+	{
+		switch ($hash) {
+			case 'rsa-sha1':
+				$this->hashAlgorithm = 'rsa-sha1';
+				break;
+			case 'rsa-sha256':
+				$this->hashAlgorithm = 'rsa-sha256';
+				if (!\defined('OPENSSL_ALGO_SHA256')) {
+					throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
+				}
+				break;
+			default:
+				throw new Swift_SwiftException('Unable to set the hash algorithm, must be one of rsa-sha1 or rsa-sha256 (%s given).', $hash);
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the body canonicalization algorithm.
+	 *
+	 * @param string $canon
+	 *
+	 * @return $this
+	 */
+	public function setBodyCanon($canon)
+	{
+		if ('relaxed' == $canon) {
+			$this->bodyCanon = 'relaxed';
+		} else {
+			$this->bodyCanon = 'simple';
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the header canonicalization algorithm.
+	 *
+	 * @param string $canon
+	 *
+	 * @return $this
+	 */
+	public function setHeaderCanon($canon)
+	{
+		if ('relaxed' == $canon) {
+			$this->headerCanon = 'relaxed';
+		} else {
+			$this->headerCanon = 'simple';
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the signer identity.
+	 *
+	 * @param string $identity
+	 *
+	 * @return $this
+	 */
+	public function setSignerIdentity($identity)
+	{
+		$this->signerIdentity = $identity;
+
+		return $this;
+	}
+
+	/**
+	 * Set the length of the body to sign.
+	 *
+	 * @param mixed $len (bool or int)
+	 *
+	 * @return $this
+	 */
+	public function setBodySignedLen($len)
+	{
+		if (true === $len) {
+			$this->showLen = true;
+			$this->maxLen = PHP_INT_MAX;
+		} elseif (false === $len) {
+			$this->showLen = false;
+			$this->maxLen = PHP_INT_MAX;
+		} else {
+			$this->showLen = true;
+			$this->maxLen = (int) $len;
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Set the signature timestamp.
+	 *
+	 * @param int $time A timestamp
+	 *
+	 * @return $this
+	 */
+	public function setSignatureTimestamp($time)
+	{
+		$this->signatureTimestamp = $time;
+
+		return $this;
+	}
+
+	/**
+	 * Set the signature expiration timestamp.
+	 *
+	 * @param int $time A timestamp
+	 *
+	 * @return $this
+	 */
+	public function setSignatureExpiration($time)
+	{
+		$this->signatureExpiration = $time;
+
+		return $this;
+	}
+
+	/**
+	 * Enable / disable the DebugHeaders.
+	 *
+	 * @param bool $debug
+	 *
+	 * @return Swift_Signers_DKIMSigner
+	 */
+	public function setDebugHeaders($debug)
+	{
+		$this->debugHeaders = (bool) $debug;
+
+		return $this;
+	}
+
+	/**
+	 * Start Body.
+	 */
+	public function startBody()
+	{
+		// Init
+		switch ($this->hashAlgorithm) {
+			case 'rsa-sha256':
+				$this->bodyHashHandler = hash_init('sha256');
+				break;
+			case 'rsa-sha1':
+				$this->bodyHashHandler = hash_init('sha1');
+				break;
+		}
+		$this->bodyCanonLine = '';
+	}
+
+	/**
+	 * End Body.
+	 */
+	public function endBody()
+	{
+		$this->endOfBody();
+	}
+
+	/**
+	 * Returns the list of Headers Tampered by this plugin.
+	 *
+	 * @return array
+	 */
+	public function getAlteredHeaders()
+	{
+		if ($this->debugHeaders) {
+			return ['DKIM-Signature', 'X-DebugHash'];
+		} else {
+			return ['DKIM-Signature'];
+		}
+	}
+
+	/**
+	 * Adds an ignored Header.
+	 *
+	 * @param string $header_name
+	 *
+	 * @return Swift_Signers_DKIMSigner
+	 */
+	public function ignoreHeader($header_name)
+	{
+		$this->ignoredHeaders[strtolower($header_name ?? '')] = true;
+
+		return $this;
+	}
+
+	/**
+	 * Set the headers to sign.
+	 *
+	 * @return Swift_Signers_DKIMSigner
+	 */
+	public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
+	{
+		$this->headerCanonData = '';
+		// Loop through Headers
+		$listHeaders = $headers->listAll();
+		foreach ($listHeaders as $hName) {
+			// Check if we need to ignore Header
+			if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
+				if ($headers->has($hName)) {
+					$tmp = $headers->getAll($hName);
+					foreach ($tmp as $header) {
+						if ('' != $header->getFieldBody()) {
+							$this->addHeader($header->toString());
+							$this->signedHeaders[] = $header->getFieldName();
+						}
+					}
+				}
+			}
+		}
+
+		return $this;
+	}
+
+	/**
+	 * Add the signature to the given Headers.
+	 *
+	 * @return Swift_Signers_DKIMSigner
+	 */
+	public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
+	{
+		// Prepare the DKIM-Signature
+		$params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
+		if ('simple' != $this->bodyCanon) {
+			$params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
+		} elseif ('simple' != $this->headerCanon) {
+			$params['c'] = $this->headerCanon;
+		}
+		if ($this->showLen) {
+			$params['l'] = $this->bodyLen;
+		}
+		if (true === $this->signatureTimestamp) {
+			$params['t'] = time();
+			if (false !== $this->signatureExpiration) {
+				$params['x'] = $params['t'] + $this->signatureExpiration;
+			}
+		} else {
+			if (false !== $this->signatureTimestamp) {
+				$params['t'] = $this->signatureTimestamp;
+			}
+			if (false !== $this->signatureExpiration) {
+				$params['x'] = $this->signatureExpiration;
+			}
+		}
+		if ($this->debugHeaders) {
+			$params['z'] = implode('|', $this->debugHeadersData);
+		}
+		$string = '';
+		foreach ($params as $k => $v) {
+			$string .= $k.'='.$v.'; ';
+		}
+		$string = trim($string);
+		$headers->addTextHeader('DKIM-Signature', $string);
+		// Add the last DKIM-Signature
+		$tmp = $headers->getAll('DKIM-Signature');
+		$this->dkimHeader = end($tmp);
+		$this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true);
+		if ($this->debugHeaders) {
+			$headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? ''));
+		}
+		$this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' ')));
+
+		return $this;
+	}
+
+	/* Private helpers */
+
+	protected function addHeader($header, $is_sig = false)
+	{
+		switch ($this->headerCanon) {
+			case 'relaxed':
+				// Prepare Header and cascade
+				$exploded = explode(':', $header, 2);
+				$name = strtolower(trim($exploded[0]));
+				$value = str_replace("\r\n", '', $exploded[1]);
+				$value = preg_replace("/[ \t][ \t]+/", ' ', $value);
+				$header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
+				// no break
+			case 'simple':
+				// Nothing to do
+		}
+		$this->addToHeaderHash($header);
+	}
+
+	protected function canonicalizeBody($string)
+	{
+		$len = \strlen($string);
+		$canon = '';
+		$method = ('relaxed' == $this->bodyCanon);
+		for ($i = 0; $i < $len; ++$i) {
+			if ($this->bodyCanonIgnoreStart > 0) {
+				--$this->bodyCanonIgnoreStart;
+				continue;
+			}
+			switch ($string[$i]) {
+				case "\r":
+					$this->bodyCanonLastChar = "\r";
+					break;
+				case "\n":
+					if ("\r" == $this->bodyCanonLastChar) {
+						if ($method) {
+							$this->bodyCanonSpace = false;
+						}
+						if ('' == $this->bodyCanonLine) {
+							++$this->bodyCanonEmptyCounter;
+						} else {
+							$this->bodyCanonLine = '';
+							$canon .= "\r\n";
+						}
+					} else {
+						// Wooops Error
+						// todo handle it but should never happen
+					}
+					break;
+				case ' ':
+				case "\t":
+					if ($method) {
+						$this->bodyCanonSpace = true;
+						break;
+					}
+					// no break
+				default:
+					if ($this->bodyCanonEmptyCounter > 0) {
+						$canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
+						$this->bodyCanonEmptyCounter = 0;
+					}
+					if ($this->bodyCanonSpace) {
+						$this->bodyCanonLine .= ' ';
+						$canon .= ' ';
+						$this->bodyCanonSpace = false;
+					}
+					$this->bodyCanonLine .= $string[$i];
+					$canon .= $string[$i];
+			}
+		}
+		$this->addToBodyHash($canon);
+	}
+
+	protected function endOfBody()
+	{
+		// Add trailing Line return if last line is non empty
+		if (\strlen($this->bodyCanonLine) > 0) {
+			$this->addToBodyHash("\r\n");
+		}
+		$this->bodyHash = hash_final($this->bodyHashHandler, true);
+	}
+
+	private function addToBodyHash($string)
+	{
+		$len = \strlen($string);
+		if ($len > ($new_len = ($this->maxLen - $this->bodyLen))) {
+			$string = substr($string, 0, $new_len);
+			$len = $new_len;
+		}
+		hash_update($this->bodyHashHandler, $string);
+		$this->bodyLen += $len;
+	}
+
+	private function addToHeaderHash($header)
+	{
+		if ($this->debugHeaders) {
+			$this->debugHeadersData[] = trim($header ?? '');
+		}
+		$this->headerCanonData .= $header;
+	}
+
+	/**
+	 * @throws Swift_SwiftException
+	 *
+	 * @return string
+	 */
+	private function getEncryptedHash()
+	{
+		$signature = '';
+		switch ($this->hashAlgorithm) {
+			case 'rsa-sha1':
+				$algorithm = OPENSSL_ALGO_SHA1;
+				break;
+			case 'rsa-sha256':
+				$algorithm = OPENSSL_ALGO_SHA256;
+				break;
+		}
+		$pkeyId = openssl_get_privatekey($this->privateKey, $this->passphrase);
+		if (!$pkeyId) {
+			throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
+		}
+		if (openssl_sign($this->headerCanonData, $signature, $pkeyId, $algorithm)) {
+			return $signature;
+		}
+		throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
+	}
 }