Dolibarr / dolibarr

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

Indentation +10 added lines, -10 removed lines

@@ -16,17 +16,17 @@
  */
 class Swift_AddressEncoderException extends Swift_RfcComplianceException
 {
-    protected $address;
+	protected $address;
 
-    public function __construct(string $message, string $address)
-    {
-        parent::__construct($message);
+	public function __construct(string $message, string $address)
+	{
+		parent::__construct($message);
 
-        $this->address = $address;
-    }
+		$this->address = $address;
+	}
 
-    public function getAddress(): string
-    {
-        return $this->address;
-    }
+	public function getAddress(): string
+	{
+		return $this->address;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php

Indentation +71 added lines, -71 removed lines

@@ -16,82 +16,82 @@
  */
 class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterReader
 {
-    /**
-     * The number of bytes in a single character.
-     *
-     * @var int
-     */
-    private $width;
+	/**
+	 * The number of bytes in a single character.
+	 *
+	 * @var int
+	 */
+	private $width;
 
-    /**
-     * Creates a new GenericFixedWidthReader using $width bytes per character.
-     *
-     * @param int $width
-     */
-    public function __construct($width)
-    {
-        $this->width = $width;
-    }
+	/**
+	 * Creates a new GenericFixedWidthReader using $width bytes per character.
+	 *
+	 * @param int $width
+	 */
+	public function __construct($width)
+	{
+		$this->width = $width;
+	}
 
-    /**
-     * Returns the complete character map.
-     *
-     * @param string $string
-     * @param int    $startOffset
-     * @param array  $currentMap
-     * @param mixed  $ignoredChars
-     *
-     * @return int
-     */
-    public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
-    {
-        $strlen = \strlen($string);
-        // % and / are CPU intensive, so, maybe find a better way
-        $ignored = $strlen % $this->width;
-        $ignoredChars = $ignored ? substr($string, -$ignored) : '';
-        $currentMap = $this->width;
+	/**
+	 * Returns the complete character map.
+	 *
+	 * @param string $string
+	 * @param int    $startOffset
+	 * @param array  $currentMap
+	 * @param mixed  $ignoredChars
+	 *
+	 * @return int
+	 */
+	public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+	{
+		$strlen = \strlen($string);
+		// % and / are CPU intensive, so, maybe find a better way
+		$ignored = $strlen % $this->width;
+		$ignoredChars = $ignored ? substr($string, -$ignored) : '';
+		$currentMap = $this->width;
 
-        return ($strlen - $ignored) / $this->width;
-    }
+		return ($strlen - $ignored) / $this->width;
+	}
 
-    /**
-     * Returns the mapType.
-     *
-     * @return int
-     */
-    public function getMapType()
-    {
-        return self::MAP_TYPE_FIXED_LEN;
-    }
+	/**
+	 * Returns the mapType.
+	 *
+	 * @return int
+	 */
+	public function getMapType()
+	{
+		return self::MAP_TYPE_FIXED_LEN;
+	}
 
-    /**
-     * Returns an integer which specifies how many more bytes to read.
-     *
-     * A positive integer indicates the number of more bytes to fetch before invoking
-     * this method again.
-     *
-     * A value of zero means this is already a valid character.
-     * A value of -1 means this cannot possibly be a valid character.
-     *
-     * @param string $bytes
-     * @param int    $size
-     *
-     * @return int
-     */
-    public function validateByteSequence($bytes, $size)
-    {
-        $needed = $this->width - $size;
+	/**
+	 * Returns an integer which specifies how many more bytes to read.
+	 *
+	 * A positive integer indicates the number of more bytes to fetch before invoking
+	 * this method again.
+	 *
+	 * A value of zero means this is already a valid character.
+	 * A value of -1 means this cannot possibly be a valid character.
+	 *
+	 * @param string $bytes
+	 * @param int    $size
+	 *
+	 * @return int
+	 */
+	public function validateByteSequence($bytes, $size)
+	{
+		$needed = $this->width - $size;
 
-        return $needed > -1 ? $needed : -1;
-    }
+		return $needed > -1 ? $needed : -1;
+	}
 
-    /**
-     * Returns the number of bytes which should be read to start each character.
-     *
-     * @return int
-     */
-    public function getInitialByteSize()
-    {
-        return $this->width;
-    }
+	/**
+	 * Returns the number of bytes which should be read to start each character.
+	 *
+	 * @return int
+	 */
+	public function getInitialByteSize()
+	{
+		return $this->width;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php

Indentation +149 added lines, -149 removed lines

@@ -16,161 +16,161 @@
  */
 class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
 {
-    /** Pre-computed for optimization */
-    private static $length_map = [
-        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x3N
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x4N
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x5N
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x6N
-        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x7N
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x8N
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x9N
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xAN
-        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xBN
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
-        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
-        3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
-        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
-    ];
+	/** Pre-computed for optimization */
+	private static $length_map = [
+		// N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x3N
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x4N
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x5N
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x6N
+		1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x7N
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x8N
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0x9N
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xAN
+		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 0xBN
+		2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
+		2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
+		3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
+		4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
+	];
 
-    private static $s_length_map = [
-        "\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
-        "\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
-        "\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
-        "\x18" => 1, "\x19" => 1, "\x1a" => 1, "\x1b" => 1, "\x1c" => 1, "\x1d" => 1, "\x1e" => 1, "\x1f" => 1,
-        "\x20" => 1, "\x21" => 1, "\x22" => 1, "\x23" => 1, "\x24" => 1, "\x25" => 1, "\x26" => 1, "\x27" => 1,
-        "\x28" => 1, "\x29" => 1, "\x2a" => 1, "\x2b" => 1, "\x2c" => 1, "\x2d" => 1, "\x2e" => 1, "\x2f" => 1,
-        "\x30" => 1, "\x31" => 1, "\x32" => 1, "\x33" => 1, "\x34" => 1, "\x35" => 1, "\x36" => 1, "\x37" => 1,
-        "\x38" => 1, "\x39" => 1, "\x3a" => 1, "\x3b" => 1, "\x3c" => 1, "\x3d" => 1, "\x3e" => 1, "\x3f" => 1,
-        "\x40" => 1, "\x41" => 1, "\x42" => 1, "\x43" => 1, "\x44" => 1, "\x45" => 1, "\x46" => 1, "\x47" => 1,
-        "\x48" => 1, "\x49" => 1, "\x4a" => 1, "\x4b" => 1, "\x4c" => 1, "\x4d" => 1, "\x4e" => 1, "\x4f" => 1,
-        "\x50" => 1, "\x51" => 1, "\x52" => 1, "\x53" => 1, "\x54" => 1, "\x55" => 1, "\x56" => 1, "\x57" => 1,
-        "\x58" => 1, "\x59" => 1, "\x5a" => 1, "\x5b" => 1, "\x5c" => 1, "\x5d" => 1, "\x5e" => 1, "\x5f" => 1,
-        "\x60" => 1, "\x61" => 1, "\x62" => 1, "\x63" => 1, "\x64" => 1, "\x65" => 1, "\x66" => 1, "\x67" => 1,
-        "\x68" => 1, "\x69" => 1, "\x6a" => 1, "\x6b" => 1, "\x6c" => 1, "\x6d" => 1, "\x6e" => 1, "\x6f" => 1,
-        "\x70" => 1, "\x71" => 1, "\x72" => 1, "\x73" => 1, "\x74" => 1, "\x75" => 1, "\x76" => 1, "\x77" => 1,
-        "\x78" => 1, "\x79" => 1, "\x7a" => 1, "\x7b" => 1, "\x7c" => 1, "\x7d" => 1, "\x7e" => 1, "\x7f" => 1,
-        "\x80" => 0, "\x81" => 0, "\x82" => 0, "\x83" => 0, "\x84" => 0, "\x85" => 0, "\x86" => 0, "\x87" => 0,
-        "\x88" => 0, "\x89" => 0, "\x8a" => 0, "\x8b" => 0, "\x8c" => 0, "\x8d" => 0, "\x8e" => 0, "\x8f" => 0,
-        "\x90" => 0, "\x91" => 0, "\x92" => 0, "\x93" => 0, "\x94" => 0, "\x95" => 0, "\x96" => 0, "\x97" => 0,
-        "\x98" => 0, "\x99" => 0, "\x9a" => 0, "\x9b" => 0, "\x9c" => 0, "\x9d" => 0, "\x9e" => 0, "\x9f" => 0,
-        "\xa0" => 0, "\xa1" => 0, "\xa2" => 0, "\xa3" => 0, "\xa4" => 0, "\xa5" => 0, "\xa6" => 0, "\xa7" => 0,
-        "\xa8" => 0, "\xa9" => 0, "\xaa" => 0, "\xab" => 0, "\xac" => 0, "\xad" => 0, "\xae" => 0, "\xaf" => 0,
-        "\xb0" => 0, "\xb1" => 0, "\xb2" => 0, "\xb3" => 0, "\xb4" => 0, "\xb5" => 0, "\xb6" => 0, "\xb7" => 0,
-        "\xb8" => 0, "\xb9" => 0, "\xba" => 0, "\xbb" => 0, "\xbc" => 0, "\xbd" => 0, "\xbe" => 0, "\xbf" => 0,
-        "\xc0" => 2, "\xc1" => 2, "\xc2" => 2, "\xc3" => 2, "\xc4" => 2, "\xc5" => 2, "\xc6" => 2, "\xc7" => 2,
-        "\xc8" => 2, "\xc9" => 2, "\xca" => 2, "\xcb" => 2, "\xcc" => 2, "\xcd" => 2, "\xce" => 2, "\xcf" => 2,
-        "\xd0" => 2, "\xd1" => 2, "\xd2" => 2, "\xd3" => 2, "\xd4" => 2, "\xd5" => 2, "\xd6" => 2, "\xd7" => 2,
-        "\xd8" => 2, "\xd9" => 2, "\xda" => 2, "\xdb" => 2, "\xdc" => 2, "\xdd" => 2, "\xde" => 2, "\xdf" => 2,
-        "\xe0" => 3, "\xe1" => 3, "\xe2" => 3, "\xe3" => 3, "\xe4" => 3, "\xe5" => 3, "\xe6" => 3, "\xe7" => 3,
-        "\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
-        "\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
-        "\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
-     ];
+	private static $s_length_map = [
+		"\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
+		"\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
+		"\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
+		"\x18" => 1, "\x19" => 1, "\x1a" => 1, "\x1b" => 1, "\x1c" => 1, "\x1d" => 1, "\x1e" => 1, "\x1f" => 1,
+		"\x20" => 1, "\x21" => 1, "\x22" => 1, "\x23" => 1, "\x24" => 1, "\x25" => 1, "\x26" => 1, "\x27" => 1,
+		"\x28" => 1, "\x29" => 1, "\x2a" => 1, "\x2b" => 1, "\x2c" => 1, "\x2d" => 1, "\x2e" => 1, "\x2f" => 1,
+		"\x30" => 1, "\x31" => 1, "\x32" => 1, "\x33" => 1, "\x34" => 1, "\x35" => 1, "\x36" => 1, "\x37" => 1,
+		"\x38" => 1, "\x39" => 1, "\x3a" => 1, "\x3b" => 1, "\x3c" => 1, "\x3d" => 1, "\x3e" => 1, "\x3f" => 1,
+		"\x40" => 1, "\x41" => 1, "\x42" => 1, "\x43" => 1, "\x44" => 1, "\x45" => 1, "\x46" => 1, "\x47" => 1,
+		"\x48" => 1, "\x49" => 1, "\x4a" => 1, "\x4b" => 1, "\x4c" => 1, "\x4d" => 1, "\x4e" => 1, "\x4f" => 1,
+		"\x50" => 1, "\x51" => 1, "\x52" => 1, "\x53" => 1, "\x54" => 1, "\x55" => 1, "\x56" => 1, "\x57" => 1,
+		"\x58" => 1, "\x59" => 1, "\x5a" => 1, "\x5b" => 1, "\x5c" => 1, "\x5d" => 1, "\x5e" => 1, "\x5f" => 1,
+		"\x60" => 1, "\x61" => 1, "\x62" => 1, "\x63" => 1, "\x64" => 1, "\x65" => 1, "\x66" => 1, "\x67" => 1,
+		"\x68" => 1, "\x69" => 1, "\x6a" => 1, "\x6b" => 1, "\x6c" => 1, "\x6d" => 1, "\x6e" => 1, "\x6f" => 1,
+		"\x70" => 1, "\x71" => 1, "\x72" => 1, "\x73" => 1, "\x74" => 1, "\x75" => 1, "\x76" => 1, "\x77" => 1,
+		"\x78" => 1, "\x79" => 1, "\x7a" => 1, "\x7b" => 1, "\x7c" => 1, "\x7d" => 1, "\x7e" => 1, "\x7f" => 1,
+		"\x80" => 0, "\x81" => 0, "\x82" => 0, "\x83" => 0, "\x84" => 0, "\x85" => 0, "\x86" => 0, "\x87" => 0,
+		"\x88" => 0, "\x89" => 0, "\x8a" => 0, "\x8b" => 0, "\x8c" => 0, "\x8d" => 0, "\x8e" => 0, "\x8f" => 0,
+		"\x90" => 0, "\x91" => 0, "\x92" => 0, "\x93" => 0, "\x94" => 0, "\x95" => 0, "\x96" => 0, "\x97" => 0,
+		"\x98" => 0, "\x99" => 0, "\x9a" => 0, "\x9b" => 0, "\x9c" => 0, "\x9d" => 0, "\x9e" => 0, "\x9f" => 0,
+		"\xa0" => 0, "\xa1" => 0, "\xa2" => 0, "\xa3" => 0, "\xa4" => 0, "\xa5" => 0, "\xa6" => 0, "\xa7" => 0,
+		"\xa8" => 0, "\xa9" => 0, "\xaa" => 0, "\xab" => 0, "\xac" => 0, "\xad" => 0, "\xae" => 0, "\xaf" => 0,
+		"\xb0" => 0, "\xb1" => 0, "\xb2" => 0, "\xb3" => 0, "\xb4" => 0, "\xb5" => 0, "\xb6" => 0, "\xb7" => 0,
+		"\xb8" => 0, "\xb9" => 0, "\xba" => 0, "\xbb" => 0, "\xbc" => 0, "\xbd" => 0, "\xbe" => 0, "\xbf" => 0,
+		"\xc0" => 2, "\xc1" => 2, "\xc2" => 2, "\xc3" => 2, "\xc4" => 2, "\xc5" => 2, "\xc6" => 2, "\xc7" => 2,
+		"\xc8" => 2, "\xc9" => 2, "\xca" => 2, "\xcb" => 2, "\xcc" => 2, "\xcd" => 2, "\xce" => 2, "\xcf" => 2,
+		"\xd0" => 2, "\xd1" => 2, "\xd2" => 2, "\xd3" => 2, "\xd4" => 2, "\xd5" => 2, "\xd6" => 2, "\xd7" => 2,
+		"\xd8" => 2, "\xd9" => 2, "\xda" => 2, "\xdb" => 2, "\xdc" => 2, "\xdd" => 2, "\xde" => 2, "\xdf" => 2,
+		"\xe0" => 3, "\xe1" => 3, "\xe2" => 3, "\xe3" => 3, "\xe4" => 3, "\xe5" => 3, "\xe6" => 3, "\xe7" => 3,
+		"\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
+		"\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
+		"\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
+	 ];
 
-    /**
-     * Returns the complete character map.
-     *
-     * @param string $string
-     * @param int    $startOffset
-     * @param array  $currentMap
-     * @param mixed  $ignoredChars
-     *
-     * @return int
-     */
-    public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
-    {
-        if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
-            $currentMap['p'] = $currentMap['i'] = [];
-        }
+	/**
+	 * Returns the complete character map.
+	 *
+	 * @param string $string
+	 * @param int    $startOffset
+	 * @param array  $currentMap
+	 * @param mixed  $ignoredChars
+	 *
+	 * @return int
+	 */
+	public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+	{
+		if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
+			$currentMap['p'] = $currentMap['i'] = [];
+		}
 
-        $strlen = \strlen($string);
-        $charPos = \count($currentMap['p']);
-        $foundChars = 0;
-        $invalid = false;
-        for ($i = 0; $i < $strlen; ++$i) {
-            $char = $string[$i];
-            $size = self::$s_length_map[$char];
-            if (0 == $size) {
-                /* char is invalid, we must wait for a resync */
-                $invalid = true;
-                continue;
-            } else {
-                if (true === $invalid) {
-                    /* We mark the chars as invalid and start a new char */
-                    $currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
-                    $currentMap['i'][$charPos + $foundChars] = true;
-                    ++$foundChars;
-                    $invalid = false;
-                }
-                if (($i + $size) > $strlen) {
-                    $ignoredChars = substr($string, $i);
-                    break;
-                }
-                for ($j = 1; $j < $size; ++$j) {
-                    $char = $string[$i + $j];
-                    if ($char > "\x7F" && $char < "\xC0") {
-                        // Valid - continue parsing
-                    } else {
-                        /* char is invalid, we must wait for a resync */
-                        $invalid = true;
-                        continue 2;
-                    }
-                }
-                /* Ok we got a complete char here */
-                $currentMap['p'][$charPos + $foundChars] = $startOffset + $i + $size;
-                $i += $j - 1;
-                ++$foundChars;
-            }
-        }
+		$strlen = \strlen($string);
+		$charPos = \count($currentMap['p']);
+		$foundChars = 0;
+		$invalid = false;
+		for ($i = 0; $i < $strlen; ++$i) {
+			$char = $string[$i];
+			$size = self::$s_length_map[$char];
+			if (0 == $size) {
+				/* char is invalid, we must wait for a resync */
+				$invalid = true;
+				continue;
+			} else {
+				if (true === $invalid) {
+					/* We mark the chars as invalid and start a new char */
+					$currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
+					$currentMap['i'][$charPos + $foundChars] = true;
+					++$foundChars;
+					$invalid = false;
+				}
+				if (($i + $size) > $strlen) {
+					$ignoredChars = substr($string, $i);
+					break;
+				}
+				for ($j = 1; $j < $size; ++$j) {
+					$char = $string[$i + $j];
+					if ($char > "\x7F" && $char < "\xC0") {
+						// Valid - continue parsing
+					} else {
+						/* char is invalid, we must wait for a resync */
+						$invalid = true;
+						continue 2;
+					}
+				}
+				/* Ok we got a complete char here */
+				$currentMap['p'][$charPos + $foundChars] = $startOffset + $i + $size;
+				$i += $j - 1;
+				++$foundChars;
+			}
+		}
 
-        return $foundChars;
-    }
+		return $foundChars;
+	}
 
-    /**
-     * Returns mapType.
-     *
-     * @return int mapType
-     */
-    public function getMapType()
-    {
-        return self::MAP_TYPE_POSITIONS;
-    }
+	/**
+	 * Returns mapType.
+	 *
+	 * @return int mapType
+	 */
+	public function getMapType()
+	{
+		return self::MAP_TYPE_POSITIONS;
+	}
 
-    /**
-     * Returns an integer which specifies how many more bytes to read.
-     *
-     * A positive integer indicates the number of more bytes to fetch before invoking
-     * this method again.
-     * A value of zero means this is already a valid character.
-     * A value of -1 means this cannot possibly be a valid character.
-     *
-     * @param string $bytes
-     * @param int    $size
-     *
-     * @return int
-     */
-    public function validateByteSequence($bytes, $size)
-    {
-        if ($size < 1) {
-            return -1;
-        }
-        $needed = self::$length_map[$bytes[0]] - $size;
+	/**
+	 * Returns an integer which specifies how many more bytes to read.
+	 *
+	 * A positive integer indicates the number of more bytes to fetch before invoking
+	 * this method again.
+	 * A value of zero means this is already a valid character.
+	 * A value of -1 means this cannot possibly be a valid character.
+	 *
+	 * @param string $bytes
+	 * @param int    $size
+	 *
+	 * @return int
+	 */
+	public function validateByteSequence($bytes, $size)
+	{
+		if ($size < 1) {
+			return -1;
+		}
+		$needed = self::$length_map[$bytes[0]] - $size;
 
-        return $needed > -1 ? $needed : -1;
-    }
+		return $needed > -1 ? $needed : -1;
+	}
 
-    /**
-     * Returns the number of bytes which should be read to start each character.
-     *
-     * @return int
-     */
-    public function getInitialByteSize()
-    {
-        return 1;
-    }
+	/**
+	 * Returns the number of bytes which should be read to start each character.
+	 *
+	 * @return int
+	 */
+	public function getInitialByteSize()
+	{
+		return 1;
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php

Indentation +61 added lines, -61 removed lines

@@ -15,70 +15,70 @@
  */
 class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
 {
-    /**
-     * Returns the complete character map.
-     *
-     * @param string $string
-     * @param int    $startOffset
-     * @param array  $currentMap
-     * @param string $ignoredChars
-     *
-     * @return int
-     */
-    public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
-    {
-        $strlen = \strlen($string);
-        $ignoredChars = '';
-        for ($i = 0; $i < $strlen; ++$i) {
-            if ($string[$i] > "\x07F") {
-                // Invalid char
-                $currentMap[$i + $startOffset] = $string[$i];
-            }
-        }
+	/**
+	 * Returns the complete character map.
+	 *
+	 * @param string $string
+	 * @param int    $startOffset
+	 * @param array  $currentMap
+	 * @param string $ignoredChars
+	 *
+	 * @return int
+	 */
+	public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
+	{
+		$strlen = \strlen($string);
+		$ignoredChars = '';
+		for ($i = 0; $i < $strlen; ++$i) {
+			if ($string[$i] > "\x07F") {
+				// Invalid char
+				$currentMap[$i + $startOffset] = $string[$i];
+			}
+		}
 
-        return $strlen;
-    }
+		return $strlen;
+	}
 
-    /**
-     * Returns mapType.
-     *
-     * @return int mapType
-     */
-    public function getMapType()
-    {
-        return self::MAP_TYPE_INVALID;
-    }
+	/**
+	 * Returns mapType.
+	 *
+	 * @return int mapType
+	 */
+	public function getMapType()
+	{
+		return self::MAP_TYPE_INVALID;
+	}
 
-    /**
-     * Returns an integer which specifies how many more bytes to read.
-     *
-     * A positive integer indicates the number of more bytes to fetch before invoking
-     * this method again.
-     * A value of zero means this is already a valid character.
-     * A value of -1 means this cannot possibly be a valid character.
-     *
-     * @param string $bytes
-     * @param int    $size
-     *
-     * @return int
-     */
-    public function validateByteSequence($bytes, $size)
-    {
-        $byte = reset($bytes);
-        if (1 == \count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
-            return 0;
-        }
+	/**
+	 * Returns an integer which specifies how many more bytes to read.
+	 *
+	 * A positive integer indicates the number of more bytes to fetch before invoking
+	 * this method again.
+	 * A value of zero means this is already a valid character.
+	 * A value of -1 means this cannot possibly be a valid character.
+	 *
+	 * @param string $bytes
+	 * @param int    $size
+	 *
+	 * @return int
+	 */
+	public function validateByteSequence($bytes, $size)
+	{
+		$byte = reset($bytes);
+		if (1 == \count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
+			return 0;
+		}
 
-        return -1;
-    }
+		return -1;
+	}
 
-    /**
-     * Returns the number of bytes which should be read to start each character.
-     *
-     * @return int
-     */
-    public function getInitialByteSize()
-    {
-        return 1;
-    }
+	/**
+	 * Returns the number of bytes which should be read to start each character.
+	 *
+	 * @return int
+	 */
+	public function getInitialByteSize()
+	{
+		return 1;
+	}
 }

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

Indentation +26 added lines, -26 removed lines

@@ -15,31 +15,31 @@
  */
 class Swift_MimePart extends Swift_Mime_MimePart
 {
-    /**
-     * Create a new MimePart.
-     *
-     * Details may be optionally passed into the constructor.
-     *
-     * @param string $body
-     * @param string $contentType
-     * @param string $charset
-     */
-    public function __construct($body = null, $contentType = null, $charset = null)
-    {
-        \call_user_func_array(
-            [$this, 'Swift_Mime_MimePart::__construct'],
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('mime.part')
-            );
+	/**
+	 * Create a new MimePart.
+	 *
+	 * Details may be optionally passed into the constructor.
+	 *
+	 * @param string $body
+	 * @param string $contentType
+	 * @param string $charset
+	 */
+	public function __construct($body = null, $contentType = null, $charset = null)
+	{
+		\call_user_func_array(
+			[$this, 'Swift_Mime_MimePart::__construct'],
+			Swift_DependencyContainer::getInstance()
+				->createDependenciesFor('mime.part')
+			);
 
-        if (!isset($charset)) {
-            $charset = Swift_DependencyContainer::getInstance()
-                ->lookup('properties.charset');
-        }
-        $this->setBody($body);
-        $this->setCharset($charset);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
-    }
+		if (!isset($charset)) {
+			$charset = Swift_DependencyContainer::getInstance()
+				->lookup('properties.charset');
+		}
+		$this->setBody($body);
+		$this->setCharset($charset);
+		if ($contentType) {
+			$this->setContentType($contentType);
+		}
+	}
 }

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

Indentation +10 added lines, -10 removed lines

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

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

Indentation +34 added lines, -34 removed lines

@@ -15,40 +15,40 @@
  */
 class Swift_Attachment extends Swift_Mime_Attachment
 {
-    /**
-     * Create a new Attachment.
-     *
-     * Details may be optionally provided to the constructor.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     */
-    public function __construct($data = null, $filename = null, $contentType = null)
-    {
-        \call_user_func_array(
-            [$this, 'Swift_Mime_Attachment::__construct'],
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('mime.attachment')
-            );
+	/**
+	 * Create a new Attachment.
+	 *
+	 * Details may be optionally provided to the constructor.
+	 *
+	 * @param string|Swift_OutputByteStream $data
+	 * @param string                        $filename
+	 * @param string                        $contentType
+	 */
+	public function __construct($data = null, $filename = null, $contentType = null)
+	{
+		\call_user_func_array(
+			[$this, 'Swift_Mime_Attachment::__construct'],
+			Swift_DependencyContainer::getInstance()
+				->createDependenciesFor('mime.attachment')
+			);
 
-        $this->setBody($data, $contentType);
-        $this->setFilename($filename);
-    }
+		$this->setBody($data, $contentType);
+		$this->setFilename($filename);
+	}
 
-    /**
-     * Create a new Attachment from a filesystem path.
-     *
-     * @param string $path
-     * @param string $contentType optional
-     *
-     * @return self
-     */
-    public static function fromPath($path, $contentType = null)
-    {
-        return (new self())->setFile(
-            new Swift_ByteStream_FileByteStream($path),
-            $contentType
-        );
-    }
+	/**
+	 * Create a new Attachment from a filesystem path.
+	 *
+	 * @param string $path
+	 * @param string $contentType optional
+	 *
+	 * @return self
+	 */
+	public static function fromPath($path, $contentType = null)
+	{
+		return (new self())->setFile(
+			new Swift_ByteStream_FileByteStream($path),
+			$contentType
+		);
+	}
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php

Indentation +17 added lines, -17 removed lines

@@ -15,22 +15,22 @@
  */
 interface Swift_Transport_SmtpAgent
 {
-    /**
-     * Get the IoBuffer where read/writes are occurring.
-     *
-     * @return Swift_Transport_IoBuffer
-     */
-    public function getBuffer();
+	/**
+	 * Get the IoBuffer where read/writes are occurring.
+	 *
+	 * @return Swift_Transport_IoBuffer
+	 */
+	public function getBuffer();
 
-    /**
-     * Run a command against the buffer, expecting the given response codes.
-     *
-     * If no response codes are given, the response will not be validated.
-     * If codes are given, an exception will be thrown on an invalid response.
-     *
-     * @param string   $command
-     * @param int[]    $codes
-     * @param string[] $failures An array of failures by-reference
-     */
-    public function executeCommand($command, $codes = [], &$failures = null);
+	/**
+	 * Run a command against the buffer, expecting the given response codes.
+	 *
+	 * If no response codes are given, the response will not be validated.
+	 * If codes are given, an exception will be thrown on an invalid response.
+	 *
+	 * @param string   $command
+	 * @param int[]    $codes
+	 * @param string[] $failures An array of failures by-reference
+	 */
+	public function executeCommand($command, $codes = [], &$failures = null);
 }

htdocs/includes/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php

Indentation +136 added lines, -136 removed lines

@@ -19,140 +19,140 @@
  */
 class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTransport
 {
-    /**
-     * Connection buffer parameters.
-     *
-     * @var array
-     */
-    private $params = [
-        'timeout' => 30,
-        'blocking' => 1,
-        'command' => '/usr/sbin/sendmail -bs',
-        'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
-        ];
-
-    /**
-     * Create a new SendmailTransport with $buf for I/O.
-     *
-     * @param string $localDomain
-     */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
-    {
-        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
-    }
-
-    /**
-     * Start the standalone SMTP session if running in -bs mode.
-     */
-    public function start()
-    {
-        if (false !== strpos($this->getCommand(), ' -bs')) {
-            parent::start();
-        }
-    }
-
-    /**
-     * Set the command to invoke.
-     *
-     * If using -t mode you are strongly advised to include -oi or -i in the flags.
-     * For example: /usr/sbin/sendmail -oi -t
-     * Swift will append a -f<sender> flag if one is not present.
-     *
-     * The recommended mode is "-bs" since it is interactive and failure notifications
-     * are hence possible.
-     *
-     * @param string $command
-     *
-     * @return $this
-     */
-    public function setCommand($command)
-    {
-        $this->params['command'] = $command;
-
-        return $this;
-    }
-
-    /**
-     * Get the sendmail command which will be invoked.
-     *
-     * @return string
-     */
-    public function getCommand()
-    {
-        return $this->params['command'];
-    }
-
-    /**
-     * Send the given Message.
-     *
-     * Recipient/sender data will be retrieved from the Message API.
-     *
-     * The return value is the number of recipients who were accepted for delivery.
-     * NOTE: If using 'sendmail -t' you will not be aware of any failures until
-     * they bounce (i.e. send() will always return 100% success).
-     *
-     * @param string[] $failedRecipients An array of failures by-reference
-     *
-     * @return int
-     */
-    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
-    {
-        $failedRecipients = (array) $failedRecipients;
-        $command = $this->getCommand();
-        $buffer = $this->getBuffer();
-        $count = 0;
-
-        if (false !== strpos($command, ' -t')) {
-            if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
-                $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-                if ($evt->bubbleCancelled()) {
-                    return 0;
-                }
-            }
-
-            if (false === strpos($command, ' -f')) {
-                $command .= ' -f'.escapeshellarg($this->getReversePath($message) ?? '');
-            }
-
-            $buffer->initialize(array_merge($this->params, ['command' => $command]));
-
-            if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
-                $buffer->setWriteTranslations(["\r\n" => "\n", "\n." => "\n.."]);
-            } else {
-                $buffer->setWriteTranslations(["\r\n" => "\n"]);
-            }
-
-            $count = \count((array) $message->getTo())
-                + \count((array) $message->getCc())
-                + \count((array) $message->getBcc())
-                ;
-            $message->toByteStream($buffer);
-            $buffer->flushBuffers();
-            $buffer->setWriteTranslations([]);
-            $buffer->terminate();
-
-            if ($evt) {
-                $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-                $evt->setFailedRecipients($failedRecipients);
-                $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-            }
-
-            $message->generateId();
-        } elseif (false !== strpos($command, ' -bs')) {
-            $count = parent::send($message, $failedRecipients);
-        } else {
-            $this->throwException(new Swift_TransportException(
-                'Unsupported sendmail command flags ['.$command.']. '.
-                'Must be one of "-bs" or "-t" but can include additional flags.'
-                ));
-        }
-
-        return $count;
-    }
-
-    /** Get the params to initialize the buffer */
-    protected function getBufferParams()
-    {
-        return $this->params;
-    }
+	/**
+	 * Connection buffer parameters.
+	 *
+	 * @var array
+	 */
+	private $params = [
+		'timeout' => 30,
+		'blocking' => 1,
+		'command' => '/usr/sbin/sendmail -bs',
+		'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
+		];
+
+	/**
+	 * Create a new SendmailTransport with $buf for I/O.
+	 *
+	 * @param string $localDomain
+	 */
+	public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
+	{
+		parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
+	}
+
+	/**
+	 * Start the standalone SMTP session if running in -bs mode.
+	 */
+	public function start()
+	{
+		if (false !== strpos($this->getCommand(), ' -bs')) {
+			parent::start();
+		}
+	}
+
+	/**
+	 * Set the command to invoke.
+	 *
+	 * If using -t mode you are strongly advised to include -oi or -i in the flags.
+	 * For example: /usr/sbin/sendmail -oi -t
+	 * Swift will append a -f<sender> flag if one is not present.
+	 *
+	 * The recommended mode is "-bs" since it is interactive and failure notifications
+	 * are hence possible.
+	 *
+	 * @param string $command
+	 *
+	 * @return $this
+	 */
+	public function setCommand($command)
+	{
+		$this->params['command'] = $command;
+
+		return $this;
+	}
+
+	/**
+	 * Get the sendmail command which will be invoked.
+	 *
+	 * @return string
+	 */
+	public function getCommand()
+	{
+		return $this->params['command'];
+	}
+
+	/**
+	 * Send the given Message.
+	 *
+	 * Recipient/sender data will be retrieved from the Message API.
+	 *
+	 * The return value is the number of recipients who were accepted for delivery.
+	 * NOTE: If using 'sendmail -t' you will not be aware of any failures until
+	 * they bounce (i.e. send() will always return 100% success).
+	 *
+	 * @param string[] $failedRecipients An array of failures by-reference
+	 *
+	 * @return int
+	 */
+	public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
+	{
+		$failedRecipients = (array) $failedRecipients;
+		$command = $this->getCommand();
+		$buffer = $this->getBuffer();
+		$count = 0;
+
+		if (false !== strpos($command, ' -t')) {
+			if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+				$this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+				if ($evt->bubbleCancelled()) {
+					return 0;
+				}
+			}
+
+			if (false === strpos($command, ' -f')) {
+				$command .= ' -f'.escapeshellarg($this->getReversePath($message) ?? '');
+			}
+
+			$buffer->initialize(array_merge($this->params, ['command' => $command]));
+
+			if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
+				$buffer->setWriteTranslations(["\r\n" => "\n", "\n." => "\n.."]);
+			} else {
+				$buffer->setWriteTranslations(["\r\n" => "\n"]);
+			}
+
+			$count = \count((array) $message->getTo())
+				+ \count((array) $message->getCc())
+				+ \count((array) $message->getBcc())
+				;
+			$message->toByteStream($buffer);
+			$buffer->flushBuffers();
+			$buffer->setWriteTranslations([]);
+			$buffer->terminate();
+
+			if ($evt) {
+				$evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
+				$evt->setFailedRecipients($failedRecipients);
+				$this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+			}
+
+			$message->generateId();
+		} elseif (false !== strpos($command, ' -bs')) {
+			$count = parent::send($message, $failedRecipients);
+		} else {
+			$this->throwException(new Swift_TransportException(
+				'Unsupported sendmail command flags ['.$command.']. '.
+				'Must be one of "-bs" or "-t" but can include additional flags.'
+				));
+		}
+
+		return $count;
+	}
+
+	/** Get the params to initialize the buffer */
+	protected function getBufferParams()
+	{
+		return $this->params;
+	}
 }