Dolibarr / dolibarr

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();
+	}
 }

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

Indentation +468 added lines, -468 removed lines

@@ -15,472 +15,472 @@
  */
 abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
 {
-    const PHRASE_PATTERN = '(?:(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?"((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21\x23-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*(?:(?:[ \t]*(?:\r\n))?[ \t])?"(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?))+?)';
-
-    /**
-     * The name of this Header.
-     *
-     * @var string
-     */
-    private $name;
-
-    /**
-     * The Encoder used to encode this Header.
-     *
-     * @var Swift_Encoder
-     */
-    private $encoder;
-
-    /**
-     * The maximum length of a line in the header.
-     *
-     * @var int
-     */
-    private $lineLength = 78;
-
-    /**
-     * The language used in this Header.
-     *
-     * @var string
-     */
-    private $lang;
-
-    /**
-     * The character set of the text in this Header.
-     *
-     * @var string
-     */
-    private $charset = 'utf-8';
-
-    /**
-     * The value of this Header, cached.
-     *
-     * @var string
-     */
-    private $cachedValue = null;
-
-    /**
-     * Set the character set used in this Header.
-     *
-     * @param string $charset
-     */
-    public function setCharset($charset)
-    {
-        $this->clearCachedValueIf($charset != $this->charset);
-        $this->charset = $charset;
-        if (isset($this->encoder)) {
-            $this->encoder->charsetChanged($charset);
-        }
-    }
-
-    /**
-     * Get the character set used in this Header.
-     *
-     * @return string
-     */
-    public function getCharset()
-    {
-        return $this->charset;
-    }
-
-    /**
-     * Set the language used in this Header.
-     *
-     * For example, for US English, 'en-us'.
-     * This can be unspecified.
-     *
-     * @param string $lang
-     */
-    public function setLanguage($lang)
-    {
-        $this->clearCachedValueIf($this->lang != $lang);
-        $this->lang = $lang;
-    }
-
-    /**
-     * Get the language used in this Header.
-     *
-     * @return string
-     */
-    public function getLanguage()
-    {
-        return $this->lang;
-    }
-
-    /**
-     * Set the encoder used for encoding the header.
-     */
-    public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
-    {
-        $this->encoder = $encoder;
-        $this->setCachedValue(null);
-    }
-
-    /**
-     * Get the encoder used for encoding this Header.
-     *
-     * @return Swift_Mime_HeaderEncoder
-     */
-    public function getEncoder()
-    {
-        return $this->encoder;
-    }
-
-    /**
-     * Get the name of this header (e.g. charset).
-     *
-     * @return string
-     */
-    public function getFieldName()
-    {
-        return $this->name;
-    }
-
-    /**
-     * Set the maximum length of lines in the header (excluding EOL).
-     *
-     * @param int $lineLength
-     */
-    public function setMaxLineLength($lineLength)
-    {
-        $this->clearCachedValueIf($this->lineLength != $lineLength);
-        $this->lineLength = $lineLength;
-    }
-
-    /**
-     * Get the maximum permitted length of lines in this Header.
-     *
-     * @return int
-     */
-    public function getMaxLineLength()
-    {
-        return $this->lineLength;
-    }
-
-    /**
-     * Get this Header rendered as a RFC 2822 compliant string.
-     *
-     * @return string
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    public function toString()
-    {
-        return $this->tokensToString($this->toTokens());
-    }
-
-    /**
-     * Returns a string representation of this object.
-     *
-     * @return string
-     *
-     * @see toString()
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /**
-     * Set the name of this Header field.
-     *
-     * @param string $name
-     */
-    protected function setFieldName($name)
-    {
-        $this->name = $name;
-    }
-
-    /**
-     * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
-     *
-     * @param string $string  as displayed
-     * @param string $charset of the text
-     * @param bool   $shorten the first line to make remove for header name
-     *
-     * @return string
-     */
-    protected function createPhrase(Swift_Mime_Header $header, $string, $charset, Swift_Mime_HeaderEncoder $encoder = null, $shorten = false)
-    {
-        // Treat token as exactly what was given
-        $phraseStr = $string;
-        // If it's not valid
-
-        if (!preg_match('/^'.self::PHRASE_PATTERN.'$/D', $phraseStr)) {
-            // .. but it is just ascii text, try escaping some characters
-            // and make it a quoted-string
-            if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
-                $phraseStr = $this->escapeSpecials($phraseStr, ['"']);
-                $phraseStr = '"'.$phraseStr.'"';
-            } else {
-                // ... otherwise it needs encoding
-                // Determine space remaining on line if first line
-                if ($shorten) {
-                    $usedLength = \strlen($header->getFieldName().': ');
-                } else {
-                    $usedLength = 0;
-                }
-                $phraseStr = $this->encodeWords($header, $string, $usedLength);
-            }
-        }
-
-        return $phraseStr;
-    }
-
-    /**
-     * Escape special characters in a string (convert to quoted-pairs).
-     *
-     * @param string   $token
-     * @param string[] $include additional chars to escape
-     *
-     * @return string
-     */
-    private function escapeSpecials($token, $include = [])
-    {
-        foreach (array_merge(['\\'], $include) as $char) {
-            $token = str_replace($char, '\\'.$char, $token);
-        }
-
-        return $token;
-    }
-
-    /**
-     * Encode needed word tokens within a string of input.
-     *
-     * @param string $input
-     * @param string $usedLength optional
-     *
-     * @return string
-     */
-    protected function encodeWords(Swift_Mime_Header $header, $input, $usedLength = -1)
-    {
-        $value = '';
-
-        $tokens = $this->getEncodableWordTokens($input);
-
-        foreach ($tokens as $token) {
-            // See RFC 2822, Sect 2.2 (really 2.2 ??)
-            if ($this->tokenNeedsEncoding($token)) {
-                // Don't encode starting WSP
-                $firstChar = substr($token, 0, 1);
-                switch ($firstChar) {
-                    case ' ':
-                    case "\t":
-                        $value .= $firstChar;
-                        $token = substr($token, 1);
-                }
-
-                if (-1 == $usedLength) {
-                    $usedLength = \strlen($header->getFieldName().': ') + \strlen($value);
-                }
-                $value .= $this->getTokenAsEncodedWord($token, $usedLength);
-
-                $header->setMaxLineLength(76); // Forcefully override
-            } else {
-                $value .= $token;
-            }
-        }
-
-        return $value;
-    }
-
-    /**
-     * Test if a token needs to be encoded or not.
-     *
-     * @param string $token
-     *
-     * @return bool
-     */
-    protected function tokenNeedsEncoding($token)
-    {
-        return preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $token);
-    }
-
-    /**
-     * Splits a string into tokens in blocks of words which can be encoded quickly.
-     *
-     * @param string $string
-     *
-     * @return string[]
-     */
-    protected function getEncodableWordTokens($string)
-    {
-        $tokens = [];
-
-        $encodedToken = '';
-        // Split at all whitespace boundaries
-        foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
-            if ($this->tokenNeedsEncoding($token)) {
-                $encodedToken .= $token;
-            } else {
-                if (\strlen($encodedToken) > 0) {
-                    $tokens[] = $encodedToken;
-                    $encodedToken = '';
-                }
-                $tokens[] = $token;
-            }
-        }
-        if (\strlen($encodedToken)) {
-            $tokens[] = $encodedToken;
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * Get a token as an encoded word for safe insertion into headers.
-     *
-     * @param string $token           token to encode
-     * @param int    $firstLineOffset optional
-     *
-     * @return string
-     */
-    protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
-    {
-        // Adjust $firstLineOffset to account for space needed for syntax
-        $charsetDecl = $this->charset;
-        if (isset($this->lang)) {
-            $charsetDecl .= '*'.$this->lang;
-        }
-        $encodingWrapperLength = \strlen(
-            '=?'.$charsetDecl.'?'.$this->encoder->getName().'??='
-            );
-
-        if ($firstLineOffset >= 75) {
-            //Does this logic need to be here?
-            $firstLineOffset = 0;
-        }
-
-        $encodedTextLines = explode("\r\n",
-            $this->encoder->encodeString(
-                $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->charset
-            ) ?? ''
-        );
-
-        if ('iso-2022-jp' !== strtolower($this->charset ?? '')) {
-            // special encoding for iso-2022-jp using mb_encode_mimeheader
-            foreach ($encodedTextLines as $lineNum => $line) {
-                $encodedTextLines[$lineNum] = '=?'.$charsetDecl.
-                    '?'.$this->encoder->getName().
-                    '?'.$line.'?=';
-            }
-        }
-
-        return implode("\r\n ", $encodedTextLines);
-    }
-
-    /**
-     * Generates tokens from the given string which include CRLF as individual tokens.
-     *
-     * @param string $token
-     *
-     * @return string[]
-     */
-    protected function generateTokenLines($token)
-    {
-        return preg_split('~(\r\n)~', $token ?? '', -1, PREG_SPLIT_DELIM_CAPTURE);
-    }
-
-    /**
-     * Set a value into the cache.
-     *
-     * @param string $value
-     */
-    protected function setCachedValue($value)
-    {
-        $this->cachedValue = $value;
-    }
-
-    /**
-     * Get the value in the cache.
-     *
-     * @return string
-     */
-    protected function getCachedValue()
-    {
-        return $this->cachedValue;
-    }
-
-    /**
-     * Clear the cached value if $condition is met.
-     *
-     * @param bool $condition
-     */
-    protected function clearCachedValueIf($condition)
-    {
-        if ($condition) {
-            $this->setCachedValue(null);
-        }
-    }
-
-    /**
-     * Generate a list of all tokens in the final header.
-     *
-     * @param string $string The string to tokenize
-     *
-     * @return array An array of tokens as strings
-     */
-    protected function toTokens($string = null)
-    {
-        if (null === $string) {
-            $string = $this->getFieldBody();
-        }
-
-        $tokens = [];
-
-        // Generate atoms; split at all invisible boundaries followed by WSP
-        foreach (preg_split('~(?=[ \t])~', $string ?? '') as $token) {
-            $newTokens = $this->generateTokenLines($token);
-            foreach ($newTokens as $newToken) {
-                $tokens[] = $newToken;
-            }
-        }
-
-        return $tokens;
-    }
-
-    /**
-     * Takes an array of tokens which appear in the header and turns them into
-     * an RFC 2822 compliant string, adding FWSP where needed.
-     *
-     * @param string[] $tokens
-     *
-     * @return string
-     */
-    private function tokensToString(array $tokens)
-    {
-        $lineCount = 0;
-        $headerLines = [];
-        $headerLines[] = $this->name.': ';
-        $currentLine = &$headerLines[$lineCount++];
-
-        // Build all tokens back into compliant header
-        foreach ($tokens as $i => $token) {
-            // Line longer than specified maximum or token was just a new line
-            if (("\r\n" == $token) ||
-                ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
-                && 0 < \strlen($currentLine)) {
-                $headerLines[] = '';
-                $currentLine = &$headerLines[$lineCount++];
-            }
-
-            // Append token to the line
-            if ("\r\n" != $token) {
-                $currentLine .= $token;
-            }
-        }
-
-        // Implode with FWS (RFC 2822, 2.2.3)
-        return implode("\r\n", $headerLines)."\r\n";
-    }
-
-    /**
-     * Make a deep copy of object.
-     */
-    public function __clone()
-    {
-        if ($this->encoder) {
-            $this->encoder = clone $this->encoder;
-        }
-    }
+	const PHRASE_PATTERN = '(?:(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?"((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21\x23-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*(?:(?:[ \t]*(?:\r\n))?[ \t])?"(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?))+?)';
+
+	/**
+	 * The name of this Header.
+	 *
+	 * @var string
+	 */
+	private $name;
+
+	/**
+	 * The Encoder used to encode this Header.
+	 *
+	 * @var Swift_Encoder
+	 */
+	private $encoder;
+
+	/**
+	 * The maximum length of a line in the header.
+	 *
+	 * @var int
+	 */
+	private $lineLength = 78;
+
+	/**
+	 * The language used in this Header.
+	 *
+	 * @var string
+	 */
+	private $lang;
+
+	/**
+	 * The character set of the text in this Header.
+	 *
+	 * @var string
+	 */
+	private $charset = 'utf-8';
+
+	/**
+	 * The value of this Header, cached.
+	 *
+	 * @var string
+	 */
+	private $cachedValue = null;
+
+	/**
+	 * Set the character set used in this Header.
+	 *
+	 * @param string $charset
+	 */
+	public function setCharset($charset)
+	{
+		$this->clearCachedValueIf($charset != $this->charset);
+		$this->charset = $charset;
+		if (isset($this->encoder)) {
+			$this->encoder->charsetChanged($charset);
+		}
+	}
+
+	/**
+	 * Get the character set used in this Header.
+	 *
+	 * @return string
+	 */
+	public function getCharset()
+	{
+		return $this->charset;
+	}
+
+	/**
+	 * Set the language used in this Header.
+	 *
+	 * For example, for US English, 'en-us'.
+	 * This can be unspecified.
+	 *
+	 * @param string $lang
+	 */
+	public function setLanguage($lang)
+	{
+		$this->clearCachedValueIf($this->lang != $lang);
+		$this->lang = $lang;
+	}
+
+	/**
+	 * Get the language used in this Header.
+	 *
+	 * @return string
+	 */
+	public function getLanguage()
+	{
+		return $this->lang;
+	}
+
+	/**
+	 * Set the encoder used for encoding the header.
+	 */
+	public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
+	{
+		$this->encoder = $encoder;
+		$this->setCachedValue(null);
+	}
+
+	/**
+	 * Get the encoder used for encoding this Header.
+	 *
+	 * @return Swift_Mime_HeaderEncoder
+	 */
+	public function getEncoder()
+	{
+		return $this->encoder;
+	}
+
+	/**
+	 * Get the name of this header (e.g. charset).
+	 *
+	 * @return string
+	 */
+	public function getFieldName()
+	{
+		return $this->name;
+	}
+
+	/**
+	 * Set the maximum length of lines in the header (excluding EOL).
+	 *
+	 * @param int $lineLength
+	 */
+	public function setMaxLineLength($lineLength)
+	{
+		$this->clearCachedValueIf($this->lineLength != $lineLength);
+		$this->lineLength = $lineLength;
+	}
+
+	/**
+	 * Get the maximum permitted length of lines in this Header.
+	 *
+	 * @return int
+	 */
+	public function getMaxLineLength()
+	{
+		return $this->lineLength;
+	}
+
+	/**
+	 * Get this Header rendered as a RFC 2822 compliant string.
+	 *
+	 * @return string
+	 *
+	 * @throws Swift_RfcComplianceException
+	 */
+	public function toString()
+	{
+		return $this->tokensToString($this->toTokens());
+	}
+
+	/**
+	 * Returns a string representation of this object.
+	 *
+	 * @return string
+	 *
+	 * @see toString()
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/**
+	 * Set the name of this Header field.
+	 *
+	 * @param string $name
+	 */
+	protected function setFieldName($name)
+	{
+		$this->name = $name;
+	}
+
+	/**
+	 * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
+	 *
+	 * @param string $string  as displayed
+	 * @param string $charset of the text
+	 * @param bool   $shorten the first line to make remove for header name
+	 *
+	 * @return string
+	 */
+	protected function createPhrase(Swift_Mime_Header $header, $string, $charset, Swift_Mime_HeaderEncoder $encoder = null, $shorten = false)
+	{
+		// Treat token as exactly what was given
+		$phraseStr = $string;
+		// If it's not valid
+
+		if (!preg_match('/^'.self::PHRASE_PATTERN.'$/D', $phraseStr)) {
+			// .. but it is just ascii text, try escaping some characters
+			// and make it a quoted-string
+			if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
+				$phraseStr = $this->escapeSpecials($phraseStr, ['"']);
+				$phraseStr = '"'.$phraseStr.'"';
+			} else {
+				// ... otherwise it needs encoding
+				// Determine space remaining on line if first line
+				if ($shorten) {
+					$usedLength = \strlen($header->getFieldName().': ');
+				} else {
+					$usedLength = 0;
+				}
+				$phraseStr = $this->encodeWords($header, $string, $usedLength);
+			}
+		}
+
+		return $phraseStr;
+	}
+
+	/**
+	 * Escape special characters in a string (convert to quoted-pairs).
+	 *
+	 * @param string   $token
+	 * @param string[] $include additional chars to escape
+	 *
+	 * @return string
+	 */
+	private function escapeSpecials($token, $include = [])
+	{
+		foreach (array_merge(['\\'], $include) as $char) {
+			$token = str_replace($char, '\\'.$char, $token);
+		}
+
+		return $token;
+	}
+
+	/**
+	 * Encode needed word tokens within a string of input.
+	 *
+	 * @param string $input
+	 * @param string $usedLength optional
+	 *
+	 * @return string
+	 */
+	protected function encodeWords(Swift_Mime_Header $header, $input, $usedLength = -1)
+	{
+		$value = '';
+
+		$tokens = $this->getEncodableWordTokens($input);
+
+		foreach ($tokens as $token) {
+			// See RFC 2822, Sect 2.2 (really 2.2 ??)
+			if ($this->tokenNeedsEncoding($token)) {
+				// Don't encode starting WSP
+				$firstChar = substr($token, 0, 1);
+				switch ($firstChar) {
+					case ' ':
+					case "\t":
+						$value .= $firstChar;
+						$token = substr($token, 1);
+				}
+
+				if (-1 == $usedLength) {
+					$usedLength = \strlen($header->getFieldName().': ') + \strlen($value);
+				}
+				$value .= $this->getTokenAsEncodedWord($token, $usedLength);
+
+				$header->setMaxLineLength(76); // Forcefully override
+			} else {
+				$value .= $token;
+			}
+		}
+
+		return $value;
+	}
+
+	/**
+	 * Test if a token needs to be encoded or not.
+	 *
+	 * @param string $token
+	 *
+	 * @return bool
+	 */
+	protected function tokenNeedsEncoding($token)
+	{
+		return preg_match('~[\x00-\x08\x10-\x19\x7F-\xFF\r\n]~', $token);
+	}
+
+	/**
+	 * Splits a string into tokens in blocks of words which can be encoded quickly.
+	 *
+	 * @param string $string
+	 *
+	 * @return string[]
+	 */
+	protected function getEncodableWordTokens($string)
+	{
+		$tokens = [];
+
+		$encodedToken = '';
+		// Split at all whitespace boundaries
+		foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
+			if ($this->tokenNeedsEncoding($token)) {
+				$encodedToken .= $token;
+			} else {
+				if (\strlen($encodedToken) > 0) {
+					$tokens[] = $encodedToken;
+					$encodedToken = '';
+				}
+				$tokens[] = $token;
+			}
+		}
+		if (\strlen($encodedToken)) {
+			$tokens[] = $encodedToken;
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Get a token as an encoded word for safe insertion into headers.
+	 *
+	 * @param string $token           token to encode
+	 * @param int    $firstLineOffset optional
+	 *
+	 * @return string
+	 */
+	protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
+	{
+		// Adjust $firstLineOffset to account for space needed for syntax
+		$charsetDecl = $this->charset;
+		if (isset($this->lang)) {
+			$charsetDecl .= '*'.$this->lang;
+		}
+		$encodingWrapperLength = \strlen(
+			'=?'.$charsetDecl.'?'.$this->encoder->getName().'??='
+			);
+
+		if ($firstLineOffset >= 75) {
+			//Does this logic need to be here?
+			$firstLineOffset = 0;
+		}
+
+		$encodedTextLines = explode("\r\n",
+			$this->encoder->encodeString(
+				$token, $firstLineOffset, 75 - $encodingWrapperLength, $this->charset
+			) ?? ''
+		);
+
+		if ('iso-2022-jp' !== strtolower($this->charset ?? '')) {
+			// special encoding for iso-2022-jp using mb_encode_mimeheader
+			foreach ($encodedTextLines as $lineNum => $line) {
+				$encodedTextLines[$lineNum] = '=?'.$charsetDecl.
+					'?'.$this->encoder->getName().
+					'?'.$line.'?=';
+			}
+		}
+
+		return implode("\r\n ", $encodedTextLines);
+	}
+
+	/**
+	 * Generates tokens from the given string which include CRLF as individual tokens.
+	 *
+	 * @param string $token
+	 *
+	 * @return string[]
+	 */
+	protected function generateTokenLines($token)
+	{
+		return preg_split('~(\r\n)~', $token ?? '', -1, PREG_SPLIT_DELIM_CAPTURE);
+	}
+
+	/**
+	 * Set a value into the cache.
+	 *
+	 * @param string $value
+	 */
+	protected function setCachedValue($value)
+	{
+		$this->cachedValue = $value;
+	}
+
+	/**
+	 * Get the value in the cache.
+	 *
+	 * @return string
+	 */
+	protected function getCachedValue()
+	{
+		return $this->cachedValue;
+	}
+
+	/**
+	 * Clear the cached value if $condition is met.
+	 *
+	 * @param bool $condition
+	 */
+	protected function clearCachedValueIf($condition)
+	{
+		if ($condition) {
+			$this->setCachedValue(null);
+		}
+	}
+
+	/**
+	 * Generate a list of all tokens in the final header.
+	 *
+	 * @param string $string The string to tokenize
+	 *
+	 * @return array An array of tokens as strings
+	 */
+	protected function toTokens($string = null)
+	{
+		if (null === $string) {
+			$string = $this->getFieldBody();
+		}
+
+		$tokens = [];
+
+		// Generate atoms; split at all invisible boundaries followed by WSP
+		foreach (preg_split('~(?=[ \t])~', $string ?? '') as $token) {
+			$newTokens = $this->generateTokenLines($token);
+			foreach ($newTokens as $newToken) {
+				$tokens[] = $newToken;
+			}
+		}
+
+		return $tokens;
+	}
+
+	/**
+	 * Takes an array of tokens which appear in the header and turns them into
+	 * an RFC 2822 compliant string, adding FWSP where needed.
+	 *
+	 * @param string[] $tokens
+	 *
+	 * @return string
+	 */
+	private function tokensToString(array $tokens)
+	{
+		$lineCount = 0;
+		$headerLines = [];
+		$headerLines[] = $this->name.': ';
+		$currentLine = &$headerLines[$lineCount++];
+
+		// Build all tokens back into compliant header
+		foreach ($tokens as $i => $token) {
+			// Line longer than specified maximum or token was just a new line
+			if (("\r\n" == $token) ||
+				($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
+				&& 0 < \strlen($currentLine)) {
+				$headerLines[] = '';
+				$currentLine = &$headerLines[$lineCount++];
+			}
+
+			// Append token to the line
+			if ("\r\n" != $token) {
+				$currentLine .= $token;
+			}
+		}
+
+		// Implode with FWS (RFC 2822, 2.2.3)
+		return implode("\r\n", $headerLines)."\r\n";
+	}
+
+	/**
+	 * Make a deep copy of object.
+	 */
+	public function __clone()
+	{
+		if ($this->encoder) {
+			$this->encoder = clone $this->encoder;
+		}
+	}
 }

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

Indentation +6 added lines, -6 removed lines

@@ -15,10 +15,10 @@
  */
 interface Swift_Mime_CharsetObserver
 {
-    /**
-     * Notify this observer that the entity's charset has changed.
-     *
-     * @param string $charset
-     */
-    public function charsetChanged($charset);
+	/**
+	 * Notify this observer that the entity's charset has changed.
+	 *
+	 * @param string $charset
+	 */
+	public function charsetChanged($charset);
 }

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

Indentation +63 added lines, -63 removed lines

@@ -15,79 +15,79 @@
  */
 interface Swift_Mime_Header
 {
-    /** Text headers */
-    const TYPE_TEXT = 2;
+	/** Text headers */
+	const TYPE_TEXT = 2;
 
-    /**  headers (text + params) */
-    const TYPE_PARAMETERIZED = 6;
+	/**  headers (text + params) */
+	const TYPE_PARAMETERIZED = 6;
 
-    /** Mailbox and address headers */
-    const TYPE_MAILBOX = 8;
+	/** Mailbox and address headers */
+	const TYPE_MAILBOX = 8;
 
-    /** Date and time headers */
-    const TYPE_DATE = 16;
+	/** Date and time headers */
+	const TYPE_DATE = 16;
 
-    /** Identification headers */
-    const TYPE_ID = 32;
+	/** Identification headers */
+	const TYPE_ID = 32;
 
-    /** Address path headers */
-    const TYPE_PATH = 64;
+	/** Address path headers */
+	const TYPE_PATH = 64;
 
-    /**
-     * 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();
+	/**
+	 * 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();
 
-    /**
-     * Set the model for the field body.
-     *
-     * The actual types needed will vary depending upon the type of Header.
-     *
-     * @param mixed $model
-     */
-    public function setFieldBodyModel($model);
+	/**
+	 * Set the model for the field body.
+	 *
+	 * The actual types needed will vary depending upon the type of Header.
+	 *
+	 * @param mixed $model
+	 */
+	public function setFieldBodyModel($model);
 
-    /**
-     * Set the charset used when rendering the Header.
-     *
-     * @param string $charset
-     */
-    public function setCharset($charset);
+	/**
+	 * Set the charset used when rendering the Header.
+	 *
+	 * @param string $charset
+	 */
+	public function setCharset($charset);
 
-    /**
-     * Get the model for the field body.
-     *
-     * The return type depends on the specifics of the Header.
-     *
-     * @return mixed
-     */
-    public function getFieldBodyModel();
+	/**
+	 * Get the model for the field body.
+	 *
+	 * The return type depends on the specifics of the Header.
+	 *
+	 * @return mixed
+	 */
+	public function getFieldBodyModel();
 
-    /**
-     * Get the name of this header (e.g. Subject).
-     *
-     * The name is an identifier and as such will be immutable.
-     *
-     * @return string
-     */
-    public function getFieldName();
+	/**
+	 * Get the name of this header (e.g. Subject).
+	 *
+	 * The name is an identifier and as such will be immutable.
+	 *
+	 * @return string
+	 */
+	public function getFieldName();
 
-    /**
-     * Get the field body, prepared for folding into a final header value.
-     *
-     * @return string
-     */
-    public function getFieldBody();
+	/**
+	 * Get the field body, prepared for folding into a final header value.
+	 *
+	 * @return string
+	 */
+	public function getFieldBody();
 
-    /**
-     * Get this Header rendered as a compliant string, including trailing CRLF.
-     *
-     * @return string
-     */
-    public function toString();
+	/**
+	 * Get this Header rendered as a compliant string, including trailing CRLF.
+	 *
+	 * @return string
+	 */
+	public function toString();
 }

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

Indentation +381 added lines, -381 removed lines

@@ -15,385 +15,385 @@
  */
 class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
 {
-    /** HeaderFactory */
-    private $factory;
-
-    /** Collection of set Headers */
-    private $headers = [];
-
-    /** Field ordering details */
-    private $order = [];
-
-    /** List of fields which are required to be displayed */
-    private $required = [];
-
-    /** The charset used by Headers */
-    private $charset;
-
-    /**
-     * Create a new SimpleHeaderSet with the given $factory.
-     *
-     * @param string $charset
-     */
-    public function __construct(Swift_Mime_SimpleHeaderFactory $factory, $charset = null)
-    {
-        $this->factory = $factory;
-        if (isset($charset)) {
-            $this->setCharset($charset);
-        }
-    }
-
-    public function newInstance()
-    {
-        return new self($this->factory);
-    }
-
-    /**
-     * Set the charset used by these headers.
-     *
-     * @param string $charset
-     */
-    public function setCharset($charset)
-    {
-        $this->charset = $charset;
-        $this->factory->charsetChanged($charset);
-        $this->notifyHeadersOfCharset($charset);
-    }
-
-    /**
-     * Add a new Mailbox Header with a list of $addresses.
-     *
-     * @param string       $name
-     * @param array|string $addresses
-     */
-    public function addMailboxHeader($name, $addresses = null)
-    {
-        $this->storeHeader($name, $this->factory->createMailboxHeader($name, $addresses));
-    }
-
-    /**
-     * Add a new Date header using $dateTime.
-     *
-     * @param string $name
-     */
-    public function addDateHeader($name, DateTimeInterface $dateTime = null)
-    {
-        $this->storeHeader($name, $this->factory->createDateHeader($name, $dateTime));
-    }
-
-    /**
-     * Add a new basic text header with $name and $value.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function addTextHeader($name, $value = null)
-    {
-        $this->storeHeader($name, $this->factory->createTextHeader($name, $value));
-    }
-
-    /**
-     * Add a new ParameterizedHeader with $name, $value and $params.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $params
-     */
-    public function addParameterizedHeader($name, $value = null, $params = [])
-    {
-        $this->storeHeader($name, $this->factory->createParameterizedHeader($name, $value, $params));
-    }
-
-    /**
-     * Add a new ID header for Message-ID or Content-ID.
-     *
-     * @param string       $name
-     * @param string|array $ids
-     */
-    public function addIdHeader($name, $ids = null)
-    {
-        $this->storeHeader($name, $this->factory->createIdHeader($name, $ids));
-    }
-
-    /**
-     * Add a new Path header with an address (path) in it.
-     *
-     * @param string $name
-     * @param string $path
-     */
-    public function addPathHeader($name, $path = null)
-    {
-        $this->storeHeader($name, $this->factory->createPathHeader($name, $path));
-    }
-
-    /**
-     * Returns true if at least one header with the given $name exists.
-     *
-     * If multiple headers match, the actual one may be specified by $index.
-     *
-     * @param string $name
-     * @param int    $index
-     *
-     * @return bool
-     */
-    public function has($name, $index = 0)
-    {
-        $lowerName = strtolower($name ?? '');
-
-        if (!\array_key_exists($lowerName, $this->headers)) {
-            return false;
-        }
-
-        if (\func_num_args() < 2) {
-            // index was not specified, so we only need to check that there is at least one header value set
-            return (bool) \count($this->headers[$lowerName]);
-        }
-
-        return \array_key_exists($index, $this->headers[$lowerName]);
-    }
-
-    /**
-     * Set a header in the HeaderSet.
-     *
-     * The header may be a previously fetched header via {@link get()} or it may
-     * be one that has been created separately.
-     *
-     * If $index is specified, the header will be inserted into the set at this
-     * offset.
-     *
-     * @param int $index
-     */
-    public function set(Swift_Mime_Header $header, $index = 0)
-    {
-        $this->storeHeader($header->getFieldName(), $header, $index);
-    }
-
-    /**
-     * Get the header with the given $name.
-     *
-     * If multiple headers match, the actual one may be specified by $index.
-     * Returns NULL if none present.
-     *
-     * @param string $name
-     * @param int    $index
-     *
-     * @return Swift_Mime_Header|null
-     */
-    public function get($name, $index = 0)
-    {
-        $name = strtolower($name ?? '');
-
-        if (\func_num_args() < 2) {
-            if ($this->has($name)) {
-                $values = array_values($this->headers[$name]);
-
-                return array_shift($values);
-            }
-        } else {
-            if ($this->has($name, $index)) {
-                return $this->headers[$name][$index];
-            }
-        }
-    }
-
-    /**
-     * Get all headers with the given $name.
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function getAll($name = null)
-    {
-        if (!isset($name)) {
-            $headers = [];
-            foreach ($this->headers as $collection) {
-                $headers = array_merge($headers, $collection);
-            }
-
-            return $headers;
-        }
-
-        $lowerName = strtolower($name ?? '');
-        if (!\array_key_exists($lowerName, $this->headers)) {
-            return [];
-        }
-
-        return $this->headers[$lowerName];
-    }
-
-    /**
-     * Return the name of all Headers.
-     *
-     * @return array
-     */
-    public function listAll()
-    {
-        $headers = $this->headers;
-        if ($this->canSort()) {
-            uksort($headers, [$this, 'sortHeaders']);
-        }
-
-        return array_keys($headers);
-    }
-
-    /**
-     * Remove the header with the given $name if it's set.
-     *
-     * If multiple headers match, the actual one may be specified by $index.
-     *
-     * @param string $name
-     * @param int    $index
-     */
-    public function remove($name, $index = 0)
-    {
-        $lowerName = strtolower($name ?? '');
-        unset($this->headers[$lowerName][$index]);
-    }
-
-    /**
-     * Remove all headers with the given $name.
-     *
-     * @param string $name
-     */
-    public function removeAll($name)
-    {
-        $lowerName = strtolower($name ?? '');
-        unset($this->headers[$lowerName]);
-    }
-
-    /**
-     * Define a list of Header names as an array in the correct order.
-     *
-     * These Headers will be output in the given order where present.
-     */
-    public function defineOrdering(array $sequence)
-    {
-        $this->order = array_flip(array_map('strtolower', $sequence));
-    }
-
-    /**
-     * Set a list of header names which must always be displayed when set.
-     *
-     * Usually headers without a field value won't be output unless set here.
-     */
-    public function setAlwaysDisplayed(array $names)
-    {
-        $this->required = array_flip(array_map('strtolower', $names));
-    }
-
-    /**
-     * Notify this observer that the entity's charset has changed.
-     *
-     * @param string $charset
-     */
-    public function charsetChanged($charset)
-    {
-        $this->setCharset($charset);
-    }
-
-    /**
-     * Returns a string with a representation of all headers.
-     *
-     * @return string
-     */
-    public function toString()
-    {
-        $string = '';
-        $headers = $this->headers;
-        if ($this->canSort()) {
-            uksort($headers, [$this, 'sortHeaders']);
-        }
-        foreach ($headers as $collection) {
-            foreach ($collection as $header) {
-                if ($this->isDisplayed($header) || '' != $header->getFieldBody()) {
-                    $string .= $header->toString();
-                }
-            }
-        }
-
-        return $string;
-    }
-
-    /**
-     * Returns a string representation of this object.
-     *
-     * @return string
-     *
-     * @see toString()
-     */
-    public function __toString()
-    {
-        return $this->toString();
-    }
-
-    /** Save a Header to the internal collection */
-    private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
-    {
-        if (!isset($this->headers[strtolower($name ?? '')])) {
-            $this->headers[strtolower($name ?? '')] = [];
-        }
-        if (!isset($offset)) {
-            $this->headers[strtolower($name ?? '')][] = $header;
-        } else {
-            $this->headers[strtolower($name ?? '')][$offset] = $header;
-        }
-    }
-
-    /** Test if the headers can be sorted */
-    private function canSort()
-    {
-        return \count($this->order) > 0;
-    }
-
-    /** uksort() algorithm for Header ordering */
-    private function sortHeaders($a, $b)
-    {
-        $lowerA = strtolower($a ?? '');
-        $lowerB = strtolower($b ?? '');
-        $aPos = \array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
-        $bPos = \array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
-
-        if (-1 === $aPos && -1 === $bPos) {
-            // just be sure to be determinist here
-            return $a > $b ? -1 : 1;
-        }
-
-        if (-1 == $aPos) {
-            return 1;
-        } elseif (-1 == $bPos) {
-            return -1;
-        }
-
-        return $aPos < $bPos ? -1 : 1;
-    }
-
-    /** Test if the given Header is always displayed */
-    private function isDisplayed(Swift_Mime_Header $header)
-    {
-        return \array_key_exists(strtolower($header->getFieldName() ?? ''), $this->required);
-    }
-
-    /** Notify all Headers of the new charset */
-    private function notifyHeadersOfCharset($charset)
-    {
-        foreach ($this->headers as $headerGroup) {
-            foreach ($headerGroup as $header) {
-                $header->setCharset($charset);
-            }
-        }
-    }
-
-    /**
-     * Make a deep copy of object.
-     */
-    public function __clone()
-    {
-        $this->factory = clone $this->factory;
-        foreach ($this->headers as $groupKey => $headerGroup) {
-            foreach ($headerGroup as $key => $header) {
-                $this->headers[$groupKey][$key] = clone $header;
-            }
-        }
-    }
+	/** HeaderFactory */
+	private $factory;
+
+	/** Collection of set Headers */
+	private $headers = [];
+
+	/** Field ordering details */
+	private $order = [];
+
+	/** List of fields which are required to be displayed */
+	private $required = [];
+
+	/** The charset used by Headers */
+	private $charset;
+
+	/**
+	 * Create a new SimpleHeaderSet with the given $factory.
+	 *
+	 * @param string $charset
+	 */
+	public function __construct(Swift_Mime_SimpleHeaderFactory $factory, $charset = null)
+	{
+		$this->factory = $factory;
+		if (isset($charset)) {
+			$this->setCharset($charset);
+		}
+	}
+
+	public function newInstance()
+	{
+		return new self($this->factory);
+	}
+
+	/**
+	 * Set the charset used by these headers.
+	 *
+	 * @param string $charset
+	 */
+	public function setCharset($charset)
+	{
+		$this->charset = $charset;
+		$this->factory->charsetChanged($charset);
+		$this->notifyHeadersOfCharset($charset);
+	}
+
+	/**
+	 * Add a new Mailbox Header with a list of $addresses.
+	 *
+	 * @param string       $name
+	 * @param array|string $addresses
+	 */
+	public function addMailboxHeader($name, $addresses = null)
+	{
+		$this->storeHeader($name, $this->factory->createMailboxHeader($name, $addresses));
+	}
+
+	/**
+	 * Add a new Date header using $dateTime.
+	 *
+	 * @param string $name
+	 */
+	public function addDateHeader($name, DateTimeInterface $dateTime = null)
+	{
+		$this->storeHeader($name, $this->factory->createDateHeader($name, $dateTime));
+	}
+
+	/**
+	 * Add a new basic text header with $name and $value.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 */
+	public function addTextHeader($name, $value = null)
+	{
+		$this->storeHeader($name, $this->factory->createTextHeader($name, $value));
+	}
+
+	/**
+	 * Add a new ParameterizedHeader with $name, $value and $params.
+	 *
+	 * @param string $name
+	 * @param string $value
+	 * @param array  $params
+	 */
+	public function addParameterizedHeader($name, $value = null, $params = [])
+	{
+		$this->storeHeader($name, $this->factory->createParameterizedHeader($name, $value, $params));
+	}
+
+	/**
+	 * Add a new ID header for Message-ID or Content-ID.
+	 *
+	 * @param string       $name
+	 * @param string|array $ids
+	 */
+	public function addIdHeader($name, $ids = null)
+	{
+		$this->storeHeader($name, $this->factory->createIdHeader($name, $ids));
+	}
+
+	/**
+	 * Add a new Path header with an address (path) in it.
+	 *
+	 * @param string $name
+	 * @param string $path
+	 */
+	public function addPathHeader($name, $path = null)
+	{
+		$this->storeHeader($name, $this->factory->createPathHeader($name, $path));
+	}
+
+	/**
+	 * Returns true if at least one header with the given $name exists.
+	 *
+	 * If multiple headers match, the actual one may be specified by $index.
+	 *
+	 * @param string $name
+	 * @param int    $index
+	 *
+	 * @return bool
+	 */
+	public function has($name, $index = 0)
+	{
+		$lowerName = strtolower($name ?? '');
+
+		if (!\array_key_exists($lowerName, $this->headers)) {
+			return false;
+		}
+
+		if (\func_num_args() < 2) {
+			// index was not specified, so we only need to check that there is at least one header value set
+			return (bool) \count($this->headers[$lowerName]);
+		}
+
+		return \array_key_exists($index, $this->headers[$lowerName]);
+	}
+
+	/**
+	 * Set a header in the HeaderSet.
+	 *
+	 * The header may be a previously fetched header via {@link get()} or it may
+	 * be one that has been created separately.
+	 *
+	 * If $index is specified, the header will be inserted into the set at this
+	 * offset.
+	 *
+	 * @param int $index
+	 */
+	public function set(Swift_Mime_Header $header, $index = 0)
+	{
+		$this->storeHeader($header->getFieldName(), $header, $index);
+	}
+
+	/**
+	 * Get the header with the given $name.
+	 *
+	 * If multiple headers match, the actual one may be specified by $index.
+	 * Returns NULL if none present.
+	 *
+	 * @param string $name
+	 * @param int    $index
+	 *
+	 * @return Swift_Mime_Header|null
+	 */
+	public function get($name, $index = 0)
+	{
+		$name = strtolower($name ?? '');
+
+		if (\func_num_args() < 2) {
+			if ($this->has($name)) {
+				$values = array_values($this->headers[$name]);
+
+				return array_shift($values);
+			}
+		} else {
+			if ($this->has($name, $index)) {
+				return $this->headers[$name][$index];
+			}
+		}
+	}
+
+	/**
+	 * Get all headers with the given $name.
+	 *
+	 * @param string $name
+	 *
+	 * @return array
+	 */
+	public function getAll($name = null)
+	{
+		if (!isset($name)) {
+			$headers = [];
+			foreach ($this->headers as $collection) {
+				$headers = array_merge($headers, $collection);
+			}
+
+			return $headers;
+		}
+
+		$lowerName = strtolower($name ?? '');
+		if (!\array_key_exists($lowerName, $this->headers)) {
+			return [];
+		}
+
+		return $this->headers[$lowerName];
+	}
+
+	/**
+	 * Return the name of all Headers.
+	 *
+	 * @return array
+	 */
+	public function listAll()
+	{
+		$headers = $this->headers;
+		if ($this->canSort()) {
+			uksort($headers, [$this, 'sortHeaders']);
+		}
+
+		return array_keys($headers);
+	}
+
+	/**
+	 * Remove the header with the given $name if it's set.
+	 *
+	 * If multiple headers match, the actual one may be specified by $index.
+	 *
+	 * @param string $name
+	 * @param int    $index
+	 */
+	public function remove($name, $index = 0)
+	{
+		$lowerName = strtolower($name ?? '');
+		unset($this->headers[$lowerName][$index]);
+	}
+
+	/**
+	 * Remove all headers with the given $name.
+	 *
+	 * @param string $name
+	 */
+	public function removeAll($name)
+	{
+		$lowerName = strtolower($name ?? '');
+		unset($this->headers[$lowerName]);
+	}
+
+	/**
+	 * Define a list of Header names as an array in the correct order.
+	 *
+	 * These Headers will be output in the given order where present.
+	 */
+	public function defineOrdering(array $sequence)
+	{
+		$this->order = array_flip(array_map('strtolower', $sequence));
+	}
+
+	/**
+	 * Set a list of header names which must always be displayed when set.
+	 *
+	 * Usually headers without a field value won't be output unless set here.
+	 */
+	public function setAlwaysDisplayed(array $names)
+	{
+		$this->required = array_flip(array_map('strtolower', $names));
+	}
+
+	/**
+	 * Notify this observer that the entity's charset has changed.
+	 *
+	 * @param string $charset
+	 */
+	public function charsetChanged($charset)
+	{
+		$this->setCharset($charset);
+	}
+
+	/**
+	 * Returns a string with a representation of all headers.
+	 *
+	 * @return string
+	 */
+	public function toString()
+	{
+		$string = '';
+		$headers = $this->headers;
+		if ($this->canSort()) {
+			uksort($headers, [$this, 'sortHeaders']);
+		}
+		foreach ($headers as $collection) {
+			foreach ($collection as $header) {
+				if ($this->isDisplayed($header) || '' != $header->getFieldBody()) {
+					$string .= $header->toString();
+				}
+			}
+		}
+
+		return $string;
+	}
+
+	/**
+	 * Returns a string representation of this object.
+	 *
+	 * @return string
+	 *
+	 * @see toString()
+	 */
+	public function __toString()
+	{
+		return $this->toString();
+	}
+
+	/** Save a Header to the internal collection */
+	private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
+	{
+		if (!isset($this->headers[strtolower($name ?? '')])) {
+			$this->headers[strtolower($name ?? '')] = [];
+		}
+		if (!isset($offset)) {
+			$this->headers[strtolower($name ?? '')][] = $header;
+		} else {
+			$this->headers[strtolower($name ?? '')][$offset] = $header;
+		}
+	}
+
+	/** Test if the headers can be sorted */
+	private function canSort()
+	{
+		return \count($this->order) > 0;
+	}
+
+	/** uksort() algorithm for Header ordering */
+	private function sortHeaders($a, $b)
+	{
+		$lowerA = strtolower($a ?? '');
+		$lowerB = strtolower($b ?? '');
+		$aPos = \array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
+		$bPos = \array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
+
+		if (-1 === $aPos && -1 === $bPos) {
+			// just be sure to be determinist here
+			return $a > $b ? -1 : 1;
+		}
+
+		if (-1 == $aPos) {
+			return 1;
+		} elseif (-1 == $bPos) {
+			return -1;
+		}
+
+		return $aPos < $bPos ? -1 : 1;
+	}
+
+	/** Test if the given Header is always displayed */
+	private function isDisplayed(Swift_Mime_Header $header)
+	{
+		return \array_key_exists(strtolower($header->getFieldName() ?? ''), $this->required);
+	}
+
+	/** Notify all Headers of the new charset */
+	private function notifyHeadersOfCharset($charset)
+	{
+		foreach ($this->headers as $headerGroup) {
+			foreach ($headerGroup as $header) {
+				$header->setCharset($charset);
+			}
+		}
+	}
+
+	/**
+	 * Make a deep copy of object.
+	 */
+	public function __clone()
+	{
+		$this->factory = clone $this->factory;
+		foreach ($this->headers as $groupKey => $headerGroup) {
+			foreach ($headerGroup as $key => $header) {
+				$this->headers[$groupKey][$key] = clone $header;
+			}
+		}
+	}
 }

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

Indentation +71 added lines, -71 removed lines

@@ -15,86 +15,86 @@
  */
 class Swift_Preferences
 {
-    /** Singleton instance */
-    private static $instance = null;
+	/** Singleton instance */
+	private static $instance = null;
 
-    /** Constructor not to be used */
-    private function __construct()
-    {
-    }
+	/** Constructor not to be used */
+	private function __construct()
+	{
+	}
 
-    /**
-     * Gets the instance of Preferences.
-     *
-     * @return self
-     */
-    public static function getInstance()
-    {
-        if (!isset(self::$instance)) {
-            self::$instance = new self();
-        }
+	/**
+	 * Gets the instance of Preferences.
+	 *
+	 * @return self
+	 */
+	public static function getInstance()
+	{
+		if (!isset(self::$instance)) {
+			self::$instance = new self();
+		}
 
-        return self::$instance;
-    }
+		return self::$instance;
+	}
 
-    /**
-     * Set the default charset used.
-     *
-     * @param string $charset
-     *
-     * @return $this
-     */
-    public function setCharset($charset)
-    {
-        Swift_DependencyContainer::getInstance()->register('properties.charset')->asValue($charset);
+	/**
+	 * Set the default charset used.
+	 *
+	 * @param string $charset
+	 *
+	 * @return $this
+	 */
+	public function setCharset($charset)
+	{
+		Swift_DependencyContainer::getInstance()->register('properties.charset')->asValue($charset);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Set the directory where temporary files can be saved.
-     *
-     * @param string $dir
-     *
-     * @return $this
-     */
-    public function setTempDir($dir)
-    {
-        Swift_DependencyContainer::getInstance()->register('tempdir')->asValue($dir);
+	/**
+	 * Set the directory where temporary files can be saved.
+	 *
+	 * @param string $dir
+	 *
+	 * @return $this
+	 */
+	public function setTempDir($dir)
+	{
+		Swift_DependencyContainer::getInstance()->register('tempdir')->asValue($dir);
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Set the type of cache to use (i.e. "disk" or "array").
-     *
-     * @param string $type
-     *
-     * @return $this
-     */
-    public function setCacheType($type)
-    {
-        Swift_DependencyContainer::getInstance()->register('cache')->asAliasOf(sprintf('cache.%s', $type));
+	/**
+	 * Set the type of cache to use (i.e. "disk" or "array").
+	 *
+	 * @param string $type
+	 *
+	 * @return $this
+	 */
+	public function setCacheType($type)
+	{
+		Swift_DependencyContainer::getInstance()->register('cache')->asAliasOf(sprintf('cache.%s', $type));
 
-        return $this;
-    }
+		return $this;
+	}
 
-    /**
-     * Set the QuotedPrintable dot escaper preference.
-     *
-     * @param bool $dotEscape
-     *
-     * @return $this
-     */
-    public function setQPDotEscape($dotEscape)
-    {
-        $dotEscape = !empty($dotEscape);
-        Swift_DependencyContainer::getInstance()
-            ->register('mime.qpcontentencoder')
-            ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-            ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
-            ->addConstructorValue($dotEscape);
+	/**
+	 * Set the QuotedPrintable dot escaper preference.
+	 *
+	 * @param bool $dotEscape
+	 *
+	 * @return $this
+	 */
+	public function setQPDotEscape($dotEscape)
+	{
+		$dotEscape = !empty($dotEscape);
+		Swift_DependencyContainer::getInstance()
+			->register('mime.qpcontentencoder')
+			->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
+			->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
+			->addConstructorValue($dotEscape);
 
-        return $this;
-    }
+		return $this;
+	}
 }