Dolibarr / dolibarr

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

Indentation +34 added lines, -34 removed lines

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

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

Indentation +44 added lines, -44 removed lines

@@ -15,51 +15,51 @@
  */
 class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_HeaderEncoder
 {
-    /**
-     * Creates a new QpHeaderEncoder for the given CharacterStream.
-     *
-     * @param Swift_CharacterStream $charStream to use for reading characters
-     */
-    public function __construct(Swift_CharacterStream $charStream)
-    {
-        parent::__construct($charStream);
-    }
+	/**
+	 * Creates a new QpHeaderEncoder for the given CharacterStream.
+	 *
+	 * @param Swift_CharacterStream $charStream to use for reading characters
+	 */
+	public function __construct(Swift_CharacterStream $charStream)
+	{
+		parent::__construct($charStream);
+	}
 
-    protected function initSafeMap()
-    {
-        foreach (array_merge(
-            range(0x61, 0x7A), range(0x41, 0x5A),
-            range(0x30, 0x39), [0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F]
-        ) as $byte) {
-            $this->safeMap[$byte] = \chr($byte);
-        }
-    }
+	protected function initSafeMap()
+	{
+		foreach (array_merge(
+			range(0x61, 0x7A), range(0x41, 0x5A),
+			range(0x30, 0x39), [0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F]
+		) as $byte) {
+			$this->safeMap[$byte] = \chr($byte);
+		}
+	}
 
-    /**
-     * Get the name of this encoding scheme.
-     *
-     * Returns the string 'Q'.
-     *
-     * @return string
-     */
-    public function getName()
-    {
-        return 'Q';
-    }
+	/**
+	 * Get the name of this encoding scheme.
+	 *
+	 * Returns the string 'Q'.
+	 *
+	 * @return string
+	 */
+	public function getName()
+	{
+		return 'Q';
+	}
 
-    /**
-     * Takes an unencoded string and produces a QP encoded string from it.
-     *
-     * @param string $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)
-    {
-        return str_replace([' ', '=20', "=\r\n"], ['_', '_', "\r\n"],
-            parent::encodeString($string, $firstLineOffset, $maxLineLength)
-        );
-    }
+	/**
+	 * Takes an unencoded string and produces a QP encoded string from it.
+	 *
+	 * @param string $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)
+	{
+		return str_replace([' ', '=20', "=\r\n"], ['_', '_', "\r\n"],
+			parent::encodeString($string, $firstLineOffset, $maxLineLength)
+		);
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php

Indentation +167 added lines, -167 removed lines

@@ -19,171 +19,171 @@
  */
 class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_AbstractHeader
 {
-    /**
-     * The IDs used in the value of this Header.
-     *
-     * This may hold multiple IDs or just a single ID.
-     *
-     * @var string[]
-     */
-    private $ids = [];
-
-    /**
-     * The strict EmailValidator.
-     *
-     * @var EmailValidator
-     */
-    private $emailValidator;
-
-    private $addressEncoder;
-
-    /**
-     * Creates a new IdentificationHeader with the given $name and $id.
-     *
-     * @param string $name
-     */
-    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
-    {
-        $this->setFieldName($name);
-        $this->emailValidator = $emailValidator;
-        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
-    }
-
-    /**
-     * Get the type of Header that this instance represents.
-     *
-     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-     *
-     * @return int
-     */
-    public function getFieldType()
-    {
-        return self::TYPE_ID;
-    }
-
-    /**
-     * Set the model for the field body.
-     *
-     * This method takes a string ID, or an array of IDs.
-     *
-     * @param mixed $model
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setFieldBodyModel($model)
-    {
-        $this->setId($model);
-    }
-
-    /**
-     * Get the model for the field body.
-     *
-     * This method returns an array of IDs
-     *
-     * @return array
-     */
-    public function getFieldBodyModel()
-    {
-        return $this->getIds();
-    }
-
-    /**
-     * Set the ID used in the value of this header.
-     *
-     * @param string|array $id
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setId($id)
-    {
-        $this->setIds(\is_array($id) ? $id : [$id]);
-    }
-
-    /**
-     * Get the ID used in the value of this Header.
-     *
-     * If multiple IDs are set only the first is returned.
-     *
-     * @return string
-     */
-    public function getId()
-    {
-        if (\count($this->ids) > 0) {
-            return $this->ids[0];
-        }
-    }
-
-    /**
-     * Set a collection of IDs to use in the value of this Header.
-     *
-     * @param string[] $ids
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setIds(array $ids)
-    {
-        $actualIds = [];
-
-        foreach ($ids as $id) {
-            $this->assertValidId($id);
-            $actualIds[] = $id;
-        }
-
-        $this->clearCachedValueIf($this->ids != $actualIds);
-        $this->ids = $actualIds;
-    }
-
-    /**
-     * Get the list of IDs used in this Header.
-     *
-     * @return string[]
-     */
-    public function getIds()
-    {
-        return $this->ids;
-    }
-
-    /**
-     * Get the string value of the body in this Header.
-     *
-     * This is not necessarily RFC 2822 compliant since folding white space will
-     * not be added at this stage (see {@see toString()} for that).
-     *
-     * @see toString()
-     *
-     * @throws Swift_RfcComplianceException
-     *
-     * @return string
-     */
-    public function getFieldBody()
-    {
-        if (!$this->getCachedValue()) {
-            $angleAddrs = [];
-
-            foreach ($this->ids as $id) {
-                $angleAddrs[] = '<'.$this->addressEncoder->encodeString($id).'>';
-            }
-
-            $this->setCachedValue(implode(' ', $angleAddrs));
-        }
-
-        return $this->getCachedValue();
-    }
-
-    /**
-     * Throws an Exception if the id passed does not comply with RFC 2822.
-     *
-     * @param string $id
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    private function assertValidId($id)
-    {
-        $emailValidation = class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation();
-
-        if (!$this->emailValidator->isValid($id, $emailValidation)) {
-            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
-        }
-    }
+	/**
+	 * The IDs used in the value of this Header.
+	 *
+	 * This may hold multiple IDs or just a single ID.
+	 *
+	 * @var string[]
+	 */
+	private $ids = [];
+
+	/**
+	 * The strict EmailValidator.
+	 *
+	 * @var EmailValidator
+	 */
+	private $emailValidator;
+
+	private $addressEncoder;
+
+	/**
+	 * Creates a new IdentificationHeader with the given $name and $id.
+	 *
+	 * @param string $name
+	 */
+	public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
+	{
+		$this->setFieldName($name);
+		$this->emailValidator = $emailValidator;
+		$this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
+	}
+
+	/**
+	 * Get the type of Header that this instance represents.
+	 *
+	 * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+	 * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+	 *
+	 * @return int
+	 */
+	public function getFieldType()
+	{
+		return self::TYPE_ID;
+	}
+
+	/**
+	 * Set the model for the field body.
+	 *
+	 * This method takes a string ID, or an array of IDs.
+	 *
+	 * @param mixed $model
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setFieldBodyModel($model)
+	{
+		$this->setId($model);
+	}
+
+	/**
+	 * Get the model for the field body.
+	 *
+	 * This method returns an array of IDs
+	 *
+	 * @return array
+	 */
+	public function getFieldBodyModel()
+	{
+		return $this->getIds();
+	}
+
+	/**
+	 * Set the ID used in the value of this header.
+	 *
+	 * @param string|array $id
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setId($id)
+	{
+		$this->setIds(\is_array($id) ? $id : [$id]);
+	}
+
+	/**
+	 * Get the ID used in the value of this Header.
+	 *
+	 * If multiple IDs are set only the first is returned.
+	 *
+	 * @return string
+	 */
+	public function getId()
+	{
+		if (\count($this->ids) > 0) {
+			return $this->ids[0];
+		}
+	}
+
+	/**
+	 * Set a collection of IDs to use in the value of this Header.
+	 *
+	 * @param string[] $ids
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setIds(array $ids)
+	{
+		$actualIds = [];
+
+		foreach ($ids as $id) {
+			$this->assertValidId($id);
+			$actualIds[] = $id;
+		}
+
+		$this->clearCachedValueIf($this->ids != $actualIds);
+		$this->ids = $actualIds;
+	}
+
+	/**
+	 * Get the list of IDs used in this Header.
+	 *
+	 * @return string[]
+	 */
+	public function getIds()
+	{
+		return $this->ids;
+	}
+
+	/**
+	 * Get the string value of the body in this Header.
+	 *
+	 * This is not necessarily RFC 2822 compliant since folding white space will
+	 * not be added at this stage (see {@see toString()} for that).
+	 *
+	 * @see toString()
+	 *
+	 * @throws Swift_RfcComplianceException
+	 *
+	 * @return string
+	 */
+	public function getFieldBody()
+	{
+		if (!$this->getCachedValue()) {
+			$angleAddrs = [];
+
+			foreach ($this->ids as $id) {
+				$angleAddrs[] = '<'.$this->addressEncoder->encodeString($id).'>';
+			}
+
+			$this->setCachedValue(implode(' ', $angleAddrs));
+		}
+
+		return $this->getCachedValue();
+	}
+
+	/**
+	 * Throws an Exception if the id passed does not comply with RFC 2822.
+	 *
+	 * @param string $id
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	private function assertValidId($id)
+	{
+		$emailValidation = class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation();
+
+		if (!$this->emailValidator->isValid($id, $emailValidation)) {
+			throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php

Indentation +237 added lines, -237 removed lines

@@ -15,241 +15,241 @@
  */
 class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_UnstructuredHeader
 {
-    /**
-     * RFC 2231's definition of a token.
-     *
-     * @var string
-     */
-    const TOKEN_REGEX = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
-
-    /**
-     * The Encoder used to encode the parameters.
-     *
-     * @var Swift_Encoder
-     */
-    private $paramEncoder;
-
-    /**
-     * The parameters as an associative array.
-     *
-     * @var string[]
-     */
-    private $params = [];
-
-    /**
-     * Creates a new ParameterizedHeader with $name.
-     *
-     * @param string $name
-     */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null)
-    {
-        parent::__construct($name, $encoder);
-        $this->paramEncoder = $paramEncoder;
-    }
-
-    /**
-     * Get the type of Header that this instance represents.
-     *
-     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-     *
-     * @return int
-     */
-    public function getFieldType()
-    {
-        return self::TYPE_PARAMETERIZED;
-    }
-
-    /**
-     * Set the character set used in this Header.
-     *
-     * @param string $charset
-     */
-    public function setCharset($charset)
-    {
-        parent::setCharset($charset);
-        if (isset($this->paramEncoder)) {
-            $this->paramEncoder->charsetChanged($charset);
-        }
-    }
-
-    /**
-     * Set the value of $parameter.
-     *
-     * @param string $parameter
-     * @param string $value
-     */
-    public function setParameter($parameter, $value)
-    {
-        $this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
-    }
-
-    /**
-     * Get the value of $parameter.
-     *
-     * @param string $parameter
-     *
-     * @return string
-     */
-    public function getParameter($parameter)
-    {
-        $params = $this->getParameters();
-
-        return $params[$parameter] ?? null;
-    }
-
-    /**
-     * Set an associative array of parameter names mapped to values.
-     *
-     * @param string[] $parameters
-     */
-    public function setParameters(array $parameters)
-    {
-        $this->clearCachedValueIf($this->params != $parameters);
-        $this->params = $parameters;
-    }
-
-    /**
-     * Returns an associative array of parameter names mapped to values.
-     *
-     * @return string[]
-     */
-    public function getParameters()
-    {
-        return $this->params;
-    }
-
-    /**
-     * Get the value of this header prepared for rendering.
-     *
-     * @return string
-     */
-    public function getFieldBody() //TODO: Check caching here
-    {
-        $body = parent::getFieldBody();
-        foreach ($this->params as $name => $value) {
-            if (null !== $value) {
-                // Add the parameter
-                $body .= '; '.$this->createParameter($name, $value);
-            }
-        }
-
-        return $body;
-    }
-
-    /**
-     * Generate a list of all tokens in the final header.
-     *
-     * This doesn't need to be overridden in theory, but it is for implementation
-     * reasons to prevent potential breakage of attributes.
-     *
-     * @param string $string The string to tokenize
-     *
-     * @return array An array of tokens as strings
-     */
-    protected function toTokens($string = null)
-    {
-        $tokens = parent::toTokens(parent::getFieldBody());
-
-        // Try creating any parameters
-        foreach ($this->params as $name => $value) {
-            if (null !== $value) {
-                // Add the semi-colon separator
-                $tokens[\count($tokens) - 1] .= ';';
-                $tokens = array_merge($tokens, $this->generateTokenLines(
-                    ' '.$this->createParameter($name, $value)
-                    ));
-            }
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * Render a RFC 2047 compliant header parameter from the $name and $value.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return string
-     */
-    private function createParameter($name, $value)
-    {
-        $origValue = $value;
-
-        $encoded = false;
-        // Allow room for parameter name, indices, "=" and DQUOTEs
-        $maxValueLength = $this->getMaxLineLength() - \strlen($name.'=*N"";') - 1;
-        $firstLineOffset = 0;
-
-        // If it's not already a valid parameter value...
-        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
-            // TODO: text, or something else??
-            // ... and it's not ascii
-            if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
-                $encoded = true;
-                // Allow space for the indices, charset and language
-                $maxValueLength = $this->getMaxLineLength() - \strlen($name.'*N*="";') - 1;
-                $firstLineOffset = \strlen(
-                    $this->getCharset()."'".$this->getLanguage()."'"
-                    );
-            }
-        }
-
-        // Encode if we need to
-        if ($encoded || \strlen($value) > $maxValueLength) {
-            if (isset($this->paramEncoder)) {
-                $value = $this->paramEncoder->encodeString(
-                    $origValue, $firstLineOffset, $maxValueLength, $this->getCharset()
-                    );
-            } else {
-                // We have to go against RFC 2183/2231 in some areas for interoperability
-                $value = $this->getTokenAsEncodedWord($origValue);
-                $encoded = false;
-            }
-        }
-
-        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : [$value];
-
-        // Need to add indices
-        if (\count($valueLines) > 1) {
-            $paramLines = [];
-            foreach ($valueLines as $i => $line) {
-                $paramLines[] = $name.'*'.$i.
-                    $this->getEndOfParameterValue($line, true, 0 == $i);
-            }
-
-            return implode(";\r\n ", $paramLines);
-        } else {
-            return $name.$this->getEndOfParameterValue(
-                $valueLines[0], $encoded, true
-                );
-        }
-    }
-
-    /**
-     * Returns the parameter value from the "=" and beyond.
-     *
-     * @param string $value     to append
-     * @param bool   $encoded
-     * @param bool   $firstLine
-     *
-     * @return string
-     */
-    private function getEndOfParameterValue($value, $encoded = false, $firstLine = false)
-    {
-        if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
-            $value = '"'.$value.'"';
-        }
-        $prepend = '=';
-        if ($encoded) {
-            $prepend = '*=';
-            if ($firstLine) {
-                $prepend = '*='.$this->getCharset()."'".$this->getLanguage().
-                    "'";
-            }
-        }
-
-        return $prepend.$value;
-    }
+	/**
+	 * RFC 2231's definition of a token.
+	 *
+	 * @var string
+	 */
+	const TOKEN_REGEX = '(?:[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7E]+)';
+
+	/**
+	 * The Encoder used to encode the parameters.
+	 *
+	 * @var Swift_Encoder
+	 */
+	private $paramEncoder;
+
+	/**
+	 * The parameters as an associative array.
+	 *
+	 * @var string[]
+	 */
+	private $params = [];
+
+	/**
+	 * Creates a new ParameterizedHeader with $name.
+	 *
+	 * @param string $name
+	 */
+	public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null)
+	{
+		parent::__construct($name, $encoder);
+		$this->paramEncoder = $paramEncoder;
+	}
+
+	/**
+	 * Get the type of Header that this instance represents.
+	 *
+	 * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+	 * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+	 *
+	 * @return int
+	 */
+	public function getFieldType()
+	{
+		return self::TYPE_PARAMETERIZED;
+	}
+
+	/**
+	 * Set the character set used in this Header.
+	 *
+	 * @param string $charset
+	 */
+	public function setCharset($charset)
+	{
+		parent::setCharset($charset);
+		if (isset($this->paramEncoder)) {
+			$this->paramEncoder->charsetChanged($charset);
+		}
+	}
+
+	/**
+	 * Set the value of $parameter.
+	 *
+	 * @param string $parameter
+	 * @param string $value
+	 */
+	public function setParameter($parameter, $value)
+	{
+		$this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
+	}
+
+	/**
+	 * Get the value of $parameter.
+	 *
+	 * @param string $parameter
+	 *
+	 * @return string
+	 */
+	public function getParameter($parameter)
+	{
+		$params = $this->getParameters();
+
+		return $params[$parameter] ?? null;
+	}
+
+	/**
+	 * Set an associative array of parameter names mapped to values.
+	 *
+	 * @param string[] $parameters
+	 */
+	public function setParameters(array $parameters)
+	{
+		$this->clearCachedValueIf($this->params != $parameters);
+		$this->params = $parameters;
+	}
+
+	/**
+	 * Returns an associative array of parameter names mapped to values.
+	 *
+	 * @return string[]
+	 */
+	public function getParameters()
+	{
+		return $this->params;
+	}
+
+	/**
+	 * Get the value of this header prepared for rendering.
+	 *
+	 * @return string
+	 */
+	public function getFieldBody() //TODO: Check caching here
+	{
+		$body = parent::getFieldBody();
+		foreach ($this->params as $name => $value) {
+			if (null !== $value) {
+				// Add the parameter
+				$body .= '; '.$this->createParameter($name, $value);
+			}
+		}
+
+		return $body;
+	}
+
+	/**
+	 * Generate a list of all tokens in the final header.
+	 *
+	 * This doesn't need to be overridden in theory, but it is for implementation
+	 * reasons to prevent potential breakage of attributes.
+	 *
+	 * @param string $string The string to tokenize
+	 *
+	 * @return array An array of tokens as strings
+	 */
+	protected function toTokens($string = null)
+	{
+		$tokens = parent::toTokens(parent::getFieldBody());
+
+		// Try creating any parameters
+		foreach ($this->params as $name => $value) {
+			if (null !== $value) {
+				// Add the semi-colon separator
+				$tokens[\count($tokens) - 1] .= ';';
+				$tokens = array_merge($tokens, $this->generateTokenLines(
+					' '.$this->createParameter($name, $value)
+					));
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Render a RFC 2047 compliant header parameter from the $name and $value.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 *
+	 * @return string
+	 */
+	private function createParameter($name, $value)
+	{
+		$origValue = $value;
+
+		$encoded = false;
+		// Allow room for parameter name, indices, "=" and DQUOTEs
+		$maxValueLength = $this->getMaxLineLength() - \strlen($name.'=*N"";') - 1;
+		$firstLineOffset = 0;
+
+		// If it's not already a valid parameter value...
+		if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
+			// TODO: text, or something else??
+			// ... and it's not ascii
+			if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
+				$encoded = true;
+				// Allow space for the indices, charset and language
+				$maxValueLength = $this->getMaxLineLength() - \strlen($name.'*N*="";') - 1;
+				$firstLineOffset = \strlen(
+					$this->getCharset()."'".$this->getLanguage()."'"
+					);
+			}
+		}
+
+		// Encode if we need to
+		if ($encoded || \strlen($value) > $maxValueLength) {
+			if (isset($this->paramEncoder)) {
+				$value = $this->paramEncoder->encodeString(
+					$origValue, $firstLineOffset, $maxValueLength, $this->getCharset()
+					);
+			} else {
+				// We have to go against RFC 2183/2231 in some areas for interoperability
+				$value = $this->getTokenAsEncodedWord($origValue);
+				$encoded = false;
+			}
+		}
+
+		$valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : [$value];
+
+		// Need to add indices
+		if (\count($valueLines) > 1) {
+			$paramLines = [];
+			foreach ($valueLines as $i => $line) {
+				$paramLines[] = $name.'*'.$i.
+					$this->getEndOfParameterValue($line, true, 0 == $i);
+			}
+
+			return implode(";\r\n ", $paramLines);
+		} else {
+			return $name.$this->getEndOfParameterValue(
+				$valueLines[0], $encoded, true
+				);
+		}
+	}
+
+	/**
+	 * Returns the parameter value from the "=" and beyond.
+	 *
+	 * @param string $value     to append
+	 * @param bool   $encoded
+	 * @param bool   $firstLine
+	 *
+	 * @return string
+	 */
+	private function getEndOfParameterValue($value, $encoded = false, $firstLine = false)
+	{
+		if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
+			$value = '"'.$value.'"';
+		}
+		$prepend = '=';
+		if ($encoded) {
+			$prepend = '*=';
+			if ($firstLine) {
+				$prepend = '*='.$this->getCharset()."'".$this->getLanguage().
+					"'";
+			}
+		}
+
+		return $prepend.$value;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php

Indentation +121 added lines, -121 removed lines

@@ -18,136 +18,136 @@
  */
 class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
 {
-    /**
-     * The address in this Header (if specified).
-     *
-     * @var string
-     */
-    private $address;
+	/**
+	 * The address in this Header (if specified).
+	 *
+	 * @var string
+	 */
+	private $address;
 
-    /**
-     * The strict EmailValidator.
-     *
-     * @var EmailValidator
-     */
-    private $emailValidator;
+	/**
+	 * The strict EmailValidator.
+	 *
+	 * @var EmailValidator
+	 */
+	private $emailValidator;
 
-    private $addressEncoder;
+	private $addressEncoder;
 
-    /**
-     * Creates a new PathHeader with the given $name.
-     *
-     * @param string $name
-     */
-    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
-    {
-        $this->setFieldName($name);
-        $this->emailValidator = $emailValidator;
-        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
-    }
+	/**
+	 * Creates a new PathHeader with the given $name.
+	 *
+	 * @param string $name
+	 */
+	public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
+	{
+		$this->setFieldName($name);
+		$this->emailValidator = $emailValidator;
+		$this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
+	}
 
-    /**
-     * Get the type of Header that this instance represents.
-     *
-     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-     *
-     * @return int
-     */
-    public function getFieldType()
-    {
-        return self::TYPE_PATH;
-    }
+	/**
+	 * Get the type of Header that this instance represents.
+	 *
+	 * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+	 * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+	 *
+	 * @return int
+	 */
+	public function getFieldType()
+	{
+		return self::TYPE_PATH;
+	}
 
-    /**
-     * Set the model for the field body.
-     * This method takes a string for an address.
-     *
-     * @param string $model
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setFieldBodyModel($model)
-    {
-        $this->setAddress($model);
-    }
+	/**
+	 * Set the model for the field body.
+	 * This method takes a string for an address.
+	 *
+	 * @param string $model
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setFieldBodyModel($model)
+	{
+		$this->setAddress($model);
+	}
 
-    /**
-     * Get the model for the field body.
-     * This method returns a string email address.
-     *
-     * @return mixed
-     */
-    public function getFieldBodyModel()
-    {
-        return $this->getAddress();
-    }
+	/**
+	 * Get the model for the field body.
+	 * This method returns a string email address.
+	 *
+	 * @return mixed
+	 */
+	public function getFieldBodyModel()
+	{
+		return $this->getAddress();
+	}
 
-    /**
-     * Set the Address which should appear in this Header.
-     *
-     * @param string $address
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setAddress($address)
-    {
-        if (null === $address) {
-            $this->address = null;
-        } elseif ('' == $address) {
-            $this->address = '';
-        } else {
-            $this->assertValidAddress($address);
-            $this->address = $address;
-        }
-        $this->setCachedValue(null);
-    }
+	/**
+	 * Set the Address which should appear in this Header.
+	 *
+	 * @param string $address
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setAddress($address)
+	{
+		if (null === $address) {
+			$this->address = null;
+		} elseif ('' == $address) {
+			$this->address = '';
+		} else {
+			$this->assertValidAddress($address);
+			$this->address = $address;
+		}
+		$this->setCachedValue(null);
+	}
 
-    /**
-     * Get the address which is used in this Header (if any).
-     *
-     * Null is returned if no address is set.
-     *
-     * @return string
-     */
-    public function getAddress()
-    {
-        return $this->address;
-    }
+	/**
+	 * Get the address which is used in this Header (if any).
+	 *
+	 * Null is returned if no address is set.
+	 *
+	 * @return string
+	 */
+	public function getAddress()
+	{
+		return $this->address;
+	}
 
-    /**
-     * Get the string value of the body in this Header.
-     *
-     * This is not necessarily RFC 2822 compliant since folding white space will
-     * not be added at this stage (see {@link toString()} for that).
-     *
-     * @see toString()
-     *
-     * @return string
-     */
-    public function getFieldBody()
-    {
-        if (!$this->getCachedValue()) {
-            if (isset($this->address)) {
-                $address = $this->addressEncoder->encodeString($this->address);
-                $this->setCachedValue('<'.$address.'>');
-            }
-        }
+	/**
+	 * Get the string value of the body in this Header.
+	 *
+	 * This is not necessarily RFC 2822 compliant since folding white space will
+	 * not be added at this stage (see {@link toString()} for that).
+	 *
+	 * @see toString()
+	 *
+	 * @return string
+	 */
+	public function getFieldBody()
+	{
+		if (!$this->getCachedValue()) {
+			if (isset($this->address)) {
+				$address = $this->addressEncoder->encodeString($this->address);
+				$this->setCachedValue('<'.$address.'>');
+			}
+		}
 
-        return $this->getCachedValue();
-    }
+		return $this->getCachedValue();
+	}
 
-    /**
-     * Throws an Exception if the address passed does not comply with RFC 2822.
-     *
-     * @param string $address
-     *
-     * @throws Swift_RfcComplianceException If address is invalid
-     */
-    private function assertValidAddress($address)
-    {
-        if (!$this->emailValidator->isValid($address, new RFCValidation())) {
-            throw new Swift_RfcComplianceException('Address set in PathHeader does not comply with addr-spec of RFC 2822.');
-        }
-    }
+	/**
+	 * Throws an Exception if the address passed does not comply with RFC 2822.
+	 *
+	 * @param string $address
+	 *
+	 * @throws Swift_RfcComplianceException If address is invalid
+	 */
+	private function assertValidAddress($address)
+	{
+		if (!$this->emailValidator->isValid($address, new RFCValidation())) {
+			throw new Swift_RfcComplianceException('Address set in PathHeader does not comply with addr-spec of RFC 2822.');
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php

Indentation +104 added lines, -104 removed lines

@@ -17,119 +17,119 @@
  */
 class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
 {
-    /**
-     * The value of this Header.
-     *
-     * @var string
-     */
-    private $value;
+	/**
+	 * The value of this Header.
+	 *
+	 * @var string
+	 */
+	private $value;
 
-    /**
-     * The name of this Header.
-     *
-     * @var string
-     */
-    private $fieldName;
+	/**
+	 * The name of this Header.
+	 *
+	 * @var string
+	 */
+	private $fieldName;
 
-    /**
-     * @param string $name
-     */
-    public function __construct($name)
-    {
-        $this->fieldName = $name;
-    }
+	/**
+	 * @param string $name
+	 */
+	public function __construct($name)
+	{
+		$this->fieldName = $name;
+	}
 
-    /**
-     * Get the type of Header that this instance represents.
-     *
-     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-     *
-     * @return int
-     */
-    public function getFieldType()
-    {
-        return self::TYPE_TEXT;
-    }
+	/**
+	 * Get the type of Header that this instance represents.
+	 *
+	 * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+	 * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+	 *
+	 * @return int
+	 */
+	public function getFieldType()
+	{
+		return self::TYPE_TEXT;
+	}
 
-    /**
-     * Set the model for the field body.
-     *
-     * This method takes a string for the field value.
-     *
-     * @param string $model
-     */
-    public function setFieldBodyModel($model)
-    {
-        $this->setValue($model);
-    }
+	/**
+	 * Set the model for the field body.
+	 *
+	 * This method takes a string for the field value.
+	 *
+	 * @param string $model
+	 */
+	public function setFieldBodyModel($model)
+	{
+		$this->setValue($model);
+	}
 
-    /**
-     * Get the model for the field body.
-     *
-     * This method returns a string.
-     *
-     * @return string
-     */
-    public function getFieldBodyModel()
-    {
-        return $this->getValue();
-    }
+	/**
+	 * Get the model for the field body.
+	 *
+	 * This method returns a string.
+	 *
+	 * @return string
+	 */
+	public function getFieldBodyModel()
+	{
+		return $this->getValue();
+	}
 
-    /**
-     * Get the (unencoded) value of this header.
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
+	/**
+	 * Get the (unencoded) value of this header.
+	 *
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return $this->value;
+	}
 
-    /**
-     * Set the (unencoded) value of this header.
-     *
-     * @param string $value
-     */
-    public function setValue($value)
-    {
-        $this->value = $value;
-    }
+	/**
+	 * Set the (unencoded) value of this header.
+	 *
+	 * @param string $value
+	 */
+	public function setValue($value)
+	{
+		$this->value = $value;
+	}
 
-    /**
-     * Get the value of this header prepared for rendering.
-     *
-     * @return string
-     */
-    public function getFieldBody()
-    {
-        return $this->value;
-    }
+	/**
+	 * Get the value of this header prepared for rendering.
+	 *
+	 * @return string
+	 */
+	public function getFieldBody()
+	{
+		return $this->value;
+	}
 
-    /**
-     * Get this Header rendered as a RFC 2822 compliant string.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        return $this->fieldName.': '.$this->value."\r\n";
-    }
+	/**
+	 * Get this Header rendered as a RFC 2822 compliant string.
+	 *
+	 * @return string
+	 */
+	public function toString()
+	{
+		return $this->fieldName.': '.$this->value."\r\n";
+	}
 
-    /**
-     * Set the Header FieldName.
-     *
-     * @see Swift_Mime_Header::getFieldName()
-     */
-    public function getFieldName()
-    {
-        return $this->fieldName;
-    }
+	/**
+	 * Set the Header FieldName.
+	 *
+	 * @see Swift_Mime_Header::getFieldName()
+	 */
+	public function getFieldName()
+	{
+		return $this->fieldName;
+	}
 
-    /**
-     * Ignored.
-     */
-    public function setCharset($charset)
-    {
-    }
+	/**
+	 * Ignored.
+	 */
+	public function setCharset($charset)
+	{
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php

Indentation +83 added lines, -83 removed lines

@@ -15,95 +15,95 @@
  */
 class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractHeader
 {
-    /**
-     * The value of this Header.
-     *
-     * @var string
-     */
-    private $value;
+	/**
+	 * The value of this Header.
+	 *
+	 * @var string
+	 */
+	private $value;
 
-    /**
-     * Creates a new SimpleHeader with $name.
-     *
-     * @param string $name
-     */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
-    {
-        $this->setFieldName($name);
-        $this->setEncoder($encoder);
-    }
+	/**
+	 * Creates a new SimpleHeader with $name.
+	 *
+	 * @param string $name
+	 */
+	public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
+	{
+		$this->setFieldName($name);
+		$this->setEncoder($encoder);
+	}
 
-    /**
-     * Get the type of Header that this instance represents.
-     *
-     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-     *
-     * @return int
-     */
-    public function getFieldType()
-    {
-        return self::TYPE_TEXT;
-    }
+	/**
+	 * Get the type of Header that this instance represents.
+	 *
+	 * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+	 * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+	 *
+	 * @return int
+	 */
+	public function getFieldType()
+	{
+		return self::TYPE_TEXT;
+	}
 
-    /**
-     * Set the model for the field body.
-     *
-     * This method takes a string for the field value.
-     *
-     * @param string $model
-     */
-    public function setFieldBodyModel($model)
-    {
-        $this->setValue($model);
-    }
+	/**
+	 * Set the model for the field body.
+	 *
+	 * This method takes a string for the field value.
+	 *
+	 * @param string $model
+	 */
+	public function setFieldBodyModel($model)
+	{
+		$this->setValue($model);
+	}
 
-    /**
-     * Get the model for the field body.
-     *
-     * This method returns a string.
-     *
-     * @return string
-     */
-    public function getFieldBodyModel()
-    {
-        return $this->getValue();
-    }
+	/**
+	 * Get the model for the field body.
+	 *
+	 * This method returns a string.
+	 *
+	 * @return string
+	 */
+	public function getFieldBodyModel()
+	{
+		return $this->getValue();
+	}
 
-    /**
-     * Get the (unencoded) value of this header.
-     *
-     * @return string
-     */
-    public function getValue()
-    {
-        return $this->value;
-    }
+	/**
+	 * Get the (unencoded) value of this header.
+	 *
+	 * @return string
+	 */
+	public function getValue()
+	{
+		return $this->value;
+	}
 
-    /**
-     * Set the (unencoded) value of this header.
-     *
-     * @param string $value
-     */
-    public function setValue($value)
-    {
-        $this->clearCachedValueIf($this->value != $value);
-        $this->value = $value;
-    }
+	/**
+	 * Set the (unencoded) value of this header.
+	 *
+	 * @param string $value
+	 */
+	public function setValue($value)
+	{
+		$this->clearCachedValueIf($this->value != $value);
+		$this->value = $value;
+	}
 
-    /**
-     * Get the value of this header prepared for rendering.
-     *
-     * @return string
-     */
-    public function getFieldBody()
-    {
-        if (!$this->getCachedValue()) {
-            $this->setCachedValue(
-                $this->encodeWords($this, $this->value)
-                );
-        }
+	/**
+	 * Get the value of this header prepared for rendering.
+	 *
+	 * @return string
+	 */
+	public function getFieldBody()
+	{
+		if (!$this->getCachedValue()) {
+			$this->setCachedValue(
+				$this->encodeWords($this, $this->value)
+				);
+		}
 
-        return $this->getCachedValue();
-    }
+		return $this->getCachedValue();
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php

Indentation +313 added lines, -313 removed lines

@@ -18,341 +18,341 @@
  */
 class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
 {
-    /**
-     * The mailboxes used in this Header.
-     *
-     * @var string[]
-     */
-    private $mailboxes = [];
+	/**
+	 * The mailboxes used in this Header.
+	 *
+	 * @var string[]
+	 */
+	private $mailboxes = [];
 
-    /**
-     * The strict EmailValidator.
-     *
-     * @var EmailValidator
-     */
-    private $emailValidator;
+	/**
+	 * The strict EmailValidator.
+	 *
+	 * @var EmailValidator
+	 */
+	private $emailValidator;
 
-    private $addressEncoder;
+	private $addressEncoder;
 
-    /**
-     * Creates a new MailboxHeader with $name.
-     *
-     * @param string $name of Header
-     */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
-    {
-        $this->setFieldName($name);
-        $this->setEncoder($encoder);
-        $this->emailValidator = $emailValidator;
-        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
-    }
+	/**
+	 * Creates a new MailboxHeader with $name.
+	 *
+	 * @param string $name of Header
+	 */
+	public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
+	{
+		$this->setFieldName($name);
+		$this->setEncoder($encoder);
+		$this->emailValidator = $emailValidator;
+		$this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
+	}
 
-    /**
-     * Get the type of Header that this instance represents.
-     *
-     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-     *
-     * @return int
-     */
-    public function getFieldType()
-    {
-        return self::TYPE_MAILBOX;
-    }
+	/**
+	 * Get the type of Header that this instance represents.
+	 *
+	 * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+	 * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+	 *
+	 * @return int
+	 */
+	public function getFieldType()
+	{
+		return self::TYPE_MAILBOX;
+	}
 
-    /**
-     * Set the model for the field body.
-     *
-     * This method takes a string, or an array of addresses.
-     *
-     * @param mixed $model
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setFieldBodyModel($model)
-    {
-        $this->setNameAddresses($model);
-    }
+	/**
+	 * Set the model for the field body.
+	 *
+	 * This method takes a string, or an array of addresses.
+	 *
+	 * @param mixed $model
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setFieldBodyModel($model)
+	{
+		$this->setNameAddresses($model);
+	}
 
-    /**
-     * Get the model for the field body.
-     *
-     * This method returns an associative array like {@link getNameAddresses()}
-     *
-     * @throws Swift_RfcComplianceException
-     *
-     * @return array
-     */
-    public function getFieldBodyModel()
-    {
-        return $this->getNameAddresses();
-    }
+	/**
+	 * Get the model for the field body.
+	 *
+	 * This method returns an associative array like {@link getNameAddresses()}
+	 *
+	 * @throws Swift_RfcComplianceException
+	 *
+	 * @return array
+	 */
+	public function getFieldBodyModel()
+	{
+		return $this->getNameAddresses();
+	}
 
-    /**
-     * Set a list of mailboxes to be shown in this Header.
-     *
-     * The mailboxes can be a simple array of addresses, or an array of
-     * key=>value pairs where (email => personalName).
-     * Example:
-     * <code>
-     * <?php
-     * //Sets two mailboxes in the Header, one with a personal name
-     * $header->setNameAddresses(array(
-     *  'chris@swiftmailer.org' => 'Chris Corbyn',
-     *  'mark@swiftmailer.org' //No associated personal name
-     *  ));
-     * ?>
-     * </code>
-     *
-     * @see __construct()
-     * @see setAddresses()
-     * @see setValue()
-     *
-     * @param string|string[] $mailboxes
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setNameAddresses($mailboxes)
-    {
-        $this->mailboxes = $this->normalizeMailboxes((array) $mailboxes);
-        $this->setCachedValue(null); //Clear any cached value
-    }
+	/**
+	 * Set a list of mailboxes to be shown in this Header.
+	 *
+	 * The mailboxes can be a simple array of addresses, or an array of
+	 * key=>value pairs where (email => personalName).
+	 * Example:
+	 * <code>
+	 * <?php
+	 * //Sets two mailboxes in the Header, one with a personal name
+	 * $header->setNameAddresses(array(
+	 *  'chris@swiftmailer.org' => 'Chris Corbyn',
+	 *  'mark@swiftmailer.org' //No associated personal name
+	 *  ));
+	 * ?>
+	 * </code>
+	 *
+	 * @see __construct()
+	 * @see setAddresses()
+	 * @see setValue()
+	 *
+	 * @param string|string[] $mailboxes
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setNameAddresses($mailboxes)
+	{
+		$this->mailboxes = $this->normalizeMailboxes((array) $mailboxes);
+		$this->setCachedValue(null); //Clear any cached value
+	}
 
-    /**
-     * Get the full mailbox list of this Header as an array of valid RFC 2822 strings.
-     *
-     * Example:
-     * <code>
-     * <?php
-     * $header = new Swift_Mime_Headers_MailboxHeader('From',
-     *  array('chris@swiftmailer.org' => 'Chris Corbyn',
-     *  'mark@swiftmailer.org' => 'Mark Corbyn')
-     *  );
-     * print_r($header->getNameAddressStrings());
-     * // array (
-     * // 0 => Chris Corbyn <chris@swiftmailer.org>,
-     * // 1 => Mark Corbyn <mark@swiftmailer.org>
-     * // )
-     * ?>
-     * </code>
-     *
-     * @see getNameAddresses()
-     * @see toString()
-     *
-     * @throws Swift_RfcComplianceException
-     *
-     * @return string[]
-     */
-    public function getNameAddressStrings()
-    {
-        return $this->createNameAddressStrings($this->getNameAddresses());
-    }
+	/**
+	 * Get the full mailbox list of this Header as an array of valid RFC 2822 strings.
+	 *
+	 * Example:
+	 * <code>
+	 * <?php
+	 * $header = new Swift_Mime_Headers_MailboxHeader('From',
+	 *  array('chris@swiftmailer.org' => 'Chris Corbyn',
+	 *  'mark@swiftmailer.org' => 'Mark Corbyn')
+	 *  );
+	 * print_r($header->getNameAddressStrings());
+	 * // array (
+	 * // 0 => Chris Corbyn <chris@swiftmailer.org>,
+	 * // 1 => Mark Corbyn <mark@swiftmailer.org>
+	 * // )
+	 * ?>
+	 * </code>
+	 *
+	 * @see getNameAddresses()
+	 * @see toString()
+	 *
+	 * @throws Swift_RfcComplianceException
+	 *
+	 * @return string[]
+	 */
+	public function getNameAddressStrings()
+	{
+		return $this->createNameAddressStrings($this->getNameAddresses());
+	}
 
-    /**
-     * Get all mailboxes in this Header as key=>value pairs.
-     *
-     * The key is the address and the value is the name (or null if none set).
-     * Example:
-     * <code>
-     * <?php
-     * $header = new Swift_Mime_Headers_MailboxHeader('From',
-     *  array('chris@swiftmailer.org' => 'Chris Corbyn',
-     *  'mark@swiftmailer.org' => 'Mark Corbyn')
-     *  );
-     * print_r($header->getNameAddresses());
-     * // array (
-     * // chris@swiftmailer.org => Chris Corbyn,
-     * // mark@swiftmailer.org => Mark Corbyn
-     * // )
-     * ?>
-     * </code>
-     *
-     * @see getAddresses()
-     * @see getNameAddressStrings()
-     *
-     * @return string[]
-     */
-    public function getNameAddresses()
-    {
-        return $this->mailboxes;
-    }
+	/**
+	 * Get all mailboxes in this Header as key=>value pairs.
+	 *
+	 * The key is the address and the value is the name (or null if none set).
+	 * Example:
+	 * <code>
+	 * <?php
+	 * $header = new Swift_Mime_Headers_MailboxHeader('From',
+	 *  array('chris@swiftmailer.org' => 'Chris Corbyn',
+	 *  'mark@swiftmailer.org' => 'Mark Corbyn')
+	 *  );
+	 * print_r($header->getNameAddresses());
+	 * // array (
+	 * // chris@swiftmailer.org => Chris Corbyn,
+	 * // mark@swiftmailer.org => Mark Corbyn
+	 * // )
+	 * ?>
+	 * </code>
+	 *
+	 * @see getAddresses()
+	 * @see getNameAddressStrings()
+	 *
+	 * @return string[]
+	 */
+	public function getNameAddresses()
+	{
+		return $this->mailboxes;
+	}
 
-    /**
-     * Makes this Header represent a list of plain email addresses with no names.
-     *
-     * Example:
-     * <code>
-     * <?php
-     * //Sets three email addresses as the Header data
-     * $header->setAddresses(
-     *  array('one@domain.tld', 'two@domain.tld', 'three@domain.tld')
-     *  );
-     * ?>
-     * </code>
-     *
-     * @see setNameAddresses()
-     * @see setValue()
-     *
-     * @param string[] $addresses
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function setAddresses($addresses)
-    {
-        $this->setNameAddresses(array_values((array) $addresses));
-    }
+	/**
+	 * Makes this Header represent a list of plain email addresses with no names.
+	 *
+	 * Example:
+	 * <code>
+	 * <?php
+	 * //Sets three email addresses as the Header data
+	 * $header->setAddresses(
+	 *  array('one@domain.tld', 'two@domain.tld', 'three@domain.tld')
+	 *  );
+	 * ?>
+	 * </code>
+	 *
+	 * @see setNameAddresses()
+	 * @see setValue()
+	 *
+	 * @param string[] $addresses
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function setAddresses($addresses)
+	{
+		$this->setNameAddresses(array_values((array) $addresses));
+	}
 
-    /**
-     * Get all email addresses in this Header.
-     *
-     * @see getNameAddresses()
-     *
-     * @return string[]
-     */
-    public function getAddresses()
-    {
-        return array_keys($this->mailboxes);
-    }
+	/**
+	 * Get all email addresses in this Header.
+	 *
+	 * @see getNameAddresses()
+	 *
+	 * @return string[]
+	 */
+	public function getAddresses()
+	{
+		return array_keys($this->mailboxes);
+	}
 
-    /**
-     * Remove one or more addresses from this Header.
-     *
-     * @param string|string[] $addresses
-     */
-    public function removeAddresses($addresses)
-    {
-        $this->setCachedValue(null);
-        foreach ((array) $addresses as $address) {
-            unset($this->mailboxes[$address]);
-        }
-    }
+	/**
+	 * Remove one or more addresses from this Header.
+	 *
+	 * @param string|string[] $addresses
+	 */
+	public function removeAddresses($addresses)
+	{
+		$this->setCachedValue(null);
+		foreach ((array) $addresses as $address) {
+			unset($this->mailboxes[$address]);
+		}
+	}
 
-    /**
-     * Get the string value of the body in this Header.
-     *
-     * This is not necessarily RFC 2822 compliant since folding white space will
-     * not be added at this stage (see {@link toString()} for that).
-     *
-     * @see toString()
-     *
-     * @throws Swift_RfcComplianceException
-     *
-     * @return string
-     */
-    public function getFieldBody()
-    {
-        // Compute the string value of the header only if needed
-        if (null === $this->getCachedValue()) {
-            $this->setCachedValue($this->createMailboxListString($this->mailboxes));
-        }
+	/**
+	 * Get the string value of the body in this Header.
+	 *
+	 * This is not necessarily RFC 2822 compliant since folding white space will
+	 * not be added at this stage (see {@link toString()} for that).
+	 *
+	 * @see toString()
+	 *
+	 * @throws Swift_RfcComplianceException
+	 *
+	 * @return string
+	 */
+	public function getFieldBody()
+	{
+		// Compute the string value of the header only if needed
+		if (null === $this->getCachedValue()) {
+			$this->setCachedValue($this->createMailboxListString($this->mailboxes));
+		}
 
-        return $this->getCachedValue();
-    }
+		return $this->getCachedValue();
+	}
 
-    /**
-     * Normalizes a user-input list of mailboxes into consistent key=>value pairs.
-     *
-     * @param string[] $mailboxes
-     *
-     * @return string[]
-     */
-    protected function normalizeMailboxes(array $mailboxes)
-    {
-        $actualMailboxes = [];
+	/**
+	 * Normalizes a user-input list of mailboxes into consistent key=>value pairs.
+	 *
+	 * @param string[] $mailboxes
+	 *
+	 * @return string[]
+	 */
+	protected function normalizeMailboxes(array $mailboxes)
+	{
+		$actualMailboxes = [];
 
-        foreach ($mailboxes as $key => $value) {
-            if (\is_string($key)) {
-                //key is email addr
-                $address = $key;
-                $name = $value;
-            } else {
-                $address = $value;
-                $name = null;
-            }
-            $this->assertValidAddress($address);
-            $actualMailboxes[$address] = $name;
-        }
+		foreach ($mailboxes as $key => $value) {
+			if (\is_string($key)) {
+				//key is email addr
+				$address = $key;
+				$name = $value;
+			} else {
+				$address = $value;
+				$name = null;
+			}
+			$this->assertValidAddress($address);
+			$actualMailboxes[$address] = $name;
+		}
 
-        return $actualMailboxes;
-    }
+		return $actualMailboxes;
+	}
 
-    /**
-     * Produces a compliant, formatted display-name based on the string given.
-     *
-     * @param string $displayName as displayed
-     * @param bool   $shorten     the first line to make remove for header name
-     *
-     * @return string
-     */
-    protected function createDisplayNameString($displayName, $shorten = false)
-    {
-        return $this->createPhrase($this, $displayName, $this->getCharset(), $this->getEncoder(), $shorten);
-    }
+	/**
+	 * Produces a compliant, formatted display-name based on the string given.
+	 *
+	 * @param string $displayName as displayed
+	 * @param bool   $shorten     the first line to make remove for header name
+	 *
+	 * @return string
+	 */
+	protected function createDisplayNameString($displayName, $shorten = false)
+	{
+		return $this->createPhrase($this, $displayName, $this->getCharset(), $this->getEncoder(), $shorten);
+	}
 
-    /**
-     * Creates a string form of all the mailboxes in the passed array.
-     *
-     * @param string[] $mailboxes
-     *
-     * @throws Swift_RfcComplianceException
-     *
-     * @return string
-     */
-    protected function createMailboxListString(array $mailboxes)
-    {
-        return implode(', ', $this->createNameAddressStrings($mailboxes));
-    }
+	/**
+	 * Creates a string form of all the mailboxes in the passed array.
+	 *
+	 * @param string[] $mailboxes
+	 *
+	 * @throws Swift_RfcComplianceException
+	 *
+	 * @return string
+	 */
+	protected function createMailboxListString(array $mailboxes)
+	{
+		return implode(', ', $this->createNameAddressStrings($mailboxes));
+	}
 
-    /**
-     * Redefine the encoding requirements for mailboxes.
-     *
-     * All "specials" must be encoded as the full header value will not be quoted
-     *
-     * @see RFC 2822 3.2.1
-     *
-     * @param string $token
-     *
-     * @return bool
-     */
-    protected function tokenNeedsEncoding($token)
-    {
-        return preg_match('/[()<>\[\]:;@\,."]/', $token) || parent::tokenNeedsEncoding($token);
-    }
+	/**
+	 * Redefine the encoding requirements for mailboxes.
+	 *
+	 * All "specials" must be encoded as the full header value will not be quoted
+	 *
+	 * @see RFC 2822 3.2.1
+	 *
+	 * @param string $token
+	 *
+	 * @return bool
+	 */
+	protected function tokenNeedsEncoding($token)
+	{
+		return preg_match('/[()<>\[\]:;@\,."]/', $token) || parent::tokenNeedsEncoding($token);
+	}
 
-    /**
-     * Return an array of strings conforming the the name-addr spec of RFC 2822.
-     *
-     * @param string[] $mailboxes
-     *
-     * @return string[]
-     */
-    private function createNameAddressStrings(array $mailboxes)
-    {
-        $strings = [];
+	/**
+	 * Return an array of strings conforming the the name-addr spec of RFC 2822.
+	 *
+	 * @param string[] $mailboxes
+	 *
+	 * @return string[]
+	 */
+	private function createNameAddressStrings(array $mailboxes)
+	{
+		$strings = [];
 
-        foreach ($mailboxes as $email => $name) {
-            $mailboxStr = $this->addressEncoder->encodeString($email);
-            if (null !== $name) {
-                $nameStr = $this->createDisplayNameString($name, empty($strings));
-                $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
-            }
-            $strings[] = $mailboxStr;
-        }
+		foreach ($mailboxes as $email => $name) {
+			$mailboxStr = $this->addressEncoder->encodeString($email);
+			if (null !== $name) {
+				$nameStr = $this->createDisplayNameString($name, empty($strings));
+				$mailboxStr = $nameStr.' <'.$mailboxStr.'>';
+			}
+			$strings[] = $mailboxStr;
+		}
 
-        return $strings;
-    }
+		return $strings;
+	}
 
-    /**
-     * Throws an Exception if the address passed does not comply with RFC 2822.
-     *
-     * @param string $address
-     *
-     * @throws Swift_RfcComplianceException if invalid
-     */
-    private function assertValidAddress($address)
-    {
-        if (!$this->emailValidator->isValid($address, new RFCValidation())) {
-            throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.');
-        }
-    }
+	/**
+	 * Throws an Exception if the address passed does not comply with RFC 2822.
+	 *
+	 * @param string $address
+	 *
+	 * @throws Swift_RfcComplianceException if invalid
+	 */
+	private function assertValidAddress($address)
+	{
+		if (!$this->emailValidator->isValid($address, new RFCValidation())) {
+			throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.');
+		}
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php

Indentation +87 added lines, -87 removed lines

@@ -15,99 +15,99 @@
  */
 class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
 {
-    /**
-     * Date-time value of this Header.
-     *
-     * @var DateTimeImmutable
-     */
-    private $dateTime;
+	/**
+	 * Date-time value of this Header.
+	 *
+	 * @var DateTimeImmutable
+	 */
+	private $dateTime;
 
-    /**
-     * Creates a new DateHeader with $name.
-     *
-     * @param string $name of Header
-     */
-    public function __construct($name)
-    {
-        $this->setFieldName($name);
-    }
+	/**
+	 * Creates a new DateHeader with $name.
+	 *
+	 * @param string $name of Header
+	 */
+	public function __construct($name)
+	{
+		$this->setFieldName($name);
+	}
 
-    /**
-     * Get the type of Header that this instance represents.
-     *
-     * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
-     * @see TYPE_DATE, TYPE_ID, TYPE_PATH
-     *
-     * @return int
-     */
-    public function getFieldType()
-    {
-        return self::TYPE_DATE;
-    }
+	/**
+	 * Get the type of Header that this instance represents.
+	 *
+	 * @see TYPE_TEXT, TYPE_PARAMETERIZED, TYPE_MAILBOX
+	 * @see TYPE_DATE, TYPE_ID, TYPE_PATH
+	 *
+	 * @return int
+	 */
+	public function getFieldType()
+	{
+		return self::TYPE_DATE;
+	}
 
-    /**
-     * Set the model for the field body.
-     *
-     * @param DateTimeInterface $model
-     */
-    public function setFieldBodyModel($model)
-    {
-        $this->setDateTime($model);
-    }
+	/**
+	 * Set the model for the field body.
+	 *
+	 * @param DateTimeInterface $model
+	 */
+	public function setFieldBodyModel($model)
+	{
+		$this->setDateTime($model);
+	}
 
-    /**
-     * Get the model for the field body.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getFieldBodyModel()
-    {
-        return $this->getDateTime();
-    }
+	/**
+	 * Get the model for the field body.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getFieldBodyModel()
+	{
+		return $this->getDateTime();
+	}
 
-    /**
-     * Get the date-time representing the Date in this Header.
-     *
-     * @return DateTimeImmutable
-     */
-    public function getDateTime()
-    {
-        return $this->dateTime;
-    }
+	/**
+	 * Get the date-time representing the Date in this Header.
+	 *
+	 * @return DateTimeImmutable
+	 */
+	public function getDateTime()
+	{
+		return $this->dateTime;
+	}
 
-    /**
-     * Set the date-time of the Date in this Header.
-     *
-     * If a DateTime instance is provided, it is converted to DateTimeImmutable.
-     */
-    public function setDateTime(DateTimeInterface $dateTime)
-    {
-        $this->clearCachedValueIf($this->getCachedValue() != $dateTime->format(DateTime::RFC2822));
-        if ($dateTime instanceof DateTime) {
-            $immutable = new DateTimeImmutable('@'.$dateTime->getTimestamp());
-            $dateTime = $immutable->setTimezone($dateTime->getTimezone());
-        }
-        $this->dateTime = $dateTime;
-    }
+	/**
+	 * Set the date-time of the Date in this Header.
+	 *
+	 * If a DateTime instance is provided, it is converted to DateTimeImmutable.
+	 */
+	public function setDateTime(DateTimeInterface $dateTime)
+	{
+		$this->clearCachedValueIf($this->getCachedValue() != $dateTime->format(DateTime::RFC2822));
+		if ($dateTime instanceof DateTime) {
+			$immutable = new DateTimeImmutable('@'.$dateTime->getTimestamp());
+			$dateTime = $immutable->setTimezone($dateTime->getTimezone());
+		}
+		$this->dateTime = $dateTime;
+	}
 
-    /**
-     * Get the string value of the body in this Header.
-     *
-     * This is not necessarily RFC 2822 compliant since folding white space will
-     * not be added at this stage (see {@link toString()} for that).
-     *
-     * @see toString()
-     *
-     * @return string
-     */
-    public function getFieldBody()
-    {
-        if (!$this->getCachedValue()) {
-            if (isset($this->dateTime)) {
-                $this->setCachedValue($this->dateTime->format(DateTime::RFC2822));
-            }
-        }
+	/**
+	 * Get the string value of the body in this Header.
+	 *
+	 * This is not necessarily RFC 2822 compliant since folding white space will
+	 * not be added at this stage (see {@link toString()} for that).
+	 *
+	 * @see toString()
+	 *
+	 * @return string
+	 */
+	public function getFieldBody()
+	{
+		if (!$this->getCachedValue()) {
+			if (isset($this->dateTime)) {
+				$this->setCachedValue($this->dateTime->format(DateTime::RFC2822));
+			}
+		}
 
-        return $this->getCachedValue();
-    }
+		return $this->getCachedValue();
+	}
 }