Dolibarr / dolibarr

htdocs/includes/odtphp/zip/PclZipProxy.php

Indentation +5 added lines, -5 removed lines

@@ -21,11 +21,11 @@
 	protected $openned = false;
 	protected $filename;
 	protected $pclzip;
-    /**
-     * Class constructor
-     *
-     * @throws PclZipProxyException
-     */
+	/**
+	 * Class constructor
+	 *
+	 * @throws PclZipProxyException
+	 */
 	public function __construct($forcedir='')
 	{
 		if (! class_exists('PclZip')) {

htdocs/includes/swiftmailer/lib/preferences.php

Indentation +1 added lines, -1 removed lines

@@ -15,5 +15,5 @@
 // If possible, use a disk cache to enable attaching large attachments etc.
 // You can override the default temporary directory by setting the TMPDIR environment variable.
 if (@is_writable($tmpDir = sys_get_temp_dir())) {
-    $preferences->setTempDir($tmpDir)->setCacheType('disk');
+	$preferences->setTempDir($tmpDir)->setCacheType('disk');
 }

htdocs/includes/swiftmailer/lib/swiftmailer_generate_mimes_config.php

Indentation +171 added lines, -171 removed lines

@@ -6,177 +6,177 @@
 
 function generateUpToDateMimeArray()
 {
-    $preamble = "<?php\n\n";
-    $preamble .= "/*\n";
-    $preamble .= " * This file is part of SwiftMailer.\n";
-    $preamble .= " * (c) 2004-2009 Chris Corbyn\n *\n";
-    $preamble .= " * For the full copyright and license information, please view the LICENSE\n";
-    $preamble .= " * file that was distributed with this source code.\n *\n";
-    $preamble .= " * autogenerated using https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n";
-    $preamble .= " * and https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml\n";
-    $preamble .= " */\n\n";
-    $preamble .= "/*\n";
-    $preamble .= " * List of MIME type automatically detected in Swift Mailer.\n";
-    $preamble .= " */\n\n";
-    $preamble .= "// You may add or take away what you like (lowercase required)\n\n";
-
-    // get current mime types files
-    $mime_types = @file_get_contents(APACHE_MIME_TYPES_URL);
-    $mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
-
-    // prepare valid mime types
-    $valid_mime_types = [];
-
-    // split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
-    if (false !== preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches)) {
-        // collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
-        $valid_mime_types_preset = [
-            'php' => 'application/x-php',
-            'php3' => 'application/x-php',
-            'php4' => 'application/x-php',
-            'php5' => 'application/x-php',
-            'zip' => 'application/zip',
-            'gif' => 'image/gif',
-            'png' => 'image/png',
-            'css' => 'text/css',
-            'js' => 'text/javascript',
-            'txt' => 'text/plain',
-            'aif' => 'audio/x-aiff',
-            'aiff' => 'audio/x-aiff',
-            'avi' => 'video/avi',
-            'bmp' => 'image/bmp',
-            'bz2' => 'application/x-bz2',
-            'csv' => 'text/csv',
-            'dmg' => 'application/x-apple-diskimage',
-            'doc' => 'application/msword',
-            'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
-            'eml' => 'message/rfc822',
-            'aps' => 'application/postscript',
-            'exe' => 'application/x-ms-dos-executable',
-            'flv' => 'video/x-flv',
-            'gz' => 'application/x-gzip',
-            'hqx' => 'application/stuffit',
-            'htm' => 'text/html',
-            'html' => 'text/html',
-            'jar' => 'application/x-java-archive',
-            'jpeg' => 'image/jpeg',
-            'jpg' => 'image/jpeg',
-            'm3u' => 'audio/x-mpegurl',
-            'm4a' => 'audio/mp4',
-            'mdb' => 'application/x-msaccess',
-            'mid' => 'audio/midi',
-            'midi' => 'audio/midi',
-            'mov' => 'video/quicktime',
-            'mp3' => 'audio/mpeg',
-            'mp4' => 'video/mp4',
-            'mpeg' => 'video/mpeg',
-            'mpg' => 'video/mpeg',
-            'odg' => 'vnd.oasis.opendocument.graphics',
-            'odp' => 'vnd.oasis.opendocument.presentation',
-            'odt' => 'vnd.oasis.opendocument.text',
-            'ods' => 'vnd.oasis.opendocument.spreadsheet',
-            'ogg' => 'audio/ogg',
-            'pdf' => 'application/pdf',
-            'ppt' => 'application/vnd.ms-powerpoint',
-            'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
-            'ps' => 'application/postscript',
-            'rar' => 'application/x-rar-compressed',
-            'rtf' => 'application/rtf',
-            'tar' => 'application/x-tar',
-            'sit' => 'application/x-stuffit',
-            'svg' => 'image/svg+xml',
-            'tif' => 'image/tiff',
-            'tiff' => 'image/tiff',
-            'ttf' => 'application/x-font-truetype',
-            'vcf' => 'text/x-vcard',
-            'wav' => 'audio/wav',
-            'wma' => 'audio/x-ms-wma',
-            'wmv' => 'audio/x-ms-wmv',
-            'xls' => 'application/vnd.ms-excel',
-            'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
-            'xml' => 'application/xml',
-        ];
-
-        // wrap array for generating file
-        foreach ($valid_mime_types_preset as $extension => $mime_type) {
-            // generate array for mimetype to extension resolver (only first match)
-            $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
-        }
-
-        // all extensions from second match
-        foreach ($matches[2] as $i => $extensions) {
-            // explode multiple extensions from string
-            $extensions = explode(' ', strtolower($extensions ?? ''));
-
-            // force array for foreach
-            if (!\is_array($extensions)) {
-                $extensions = [$extensions];
-            }
-
-            foreach ($extensions as $extension) {
-                // get mime type
-                $mime_type = $matches[1][$i];
-
-                // check if string length lower than 10
-                if (\strlen($extension) < 10) {
-                    if (!isset($valid_mime_types[$mime_type])) {
-                        // generate array for mimetype to extension resolver (only first match)
-                        $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
-                    }
-                }
-            }
-        }
-    }
-
-    $xml = simplexml_load_string($mime_xml);
-
-    foreach ($xml as $node) {
-        // check if there is no pattern
-        if (!isset($node->glob['pattern'])) {
-            continue;
-        }
-
-        // get all matching extensions from match
-        foreach ((array) $node->glob['pattern'] as $extension) {
-            // skip none glob extensions
-            if (false === strpos($extension ?? '', '.')) {
-                continue;
-            }
-
-            // remove get only last part
-            $extension = explode('.', strtolower($extension ?? ''));
-            $extension = end($extension);
-        }
-
-        if (isset($node->glob['pattern'][0])) {
-            // mime type
-            $mime_type = strtolower((string) $node['type'] ?? '');
-
-            // get first extension
-            $extension = strtolower(trim($node->glob['ddpattern'][0] ?? '', '*.'));
-
-            // skip none glob extensions and check if string length between 1 and 10
-            if (false !== strpos($extension, '.') || \strlen($extension) < 1 || \strlen($extension) > 9) {
-                continue;
-            }
-
-            // check if string length lower than 10
-            if (!isset($valid_mime_types[$mime_type])) {
-                // generate array for mimetype to extension resolver (only first match)
-                $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
-            }
-        }
-    }
-
-    // full list of valid extensions only
-    $valid_mime_types = array_unique($valid_mime_types);
-    ksort($valid_mime_types);
-
-    // combine mime types and extensions array
-    $output = "$preamble\$swift_mime_types = array(\n    ".implode(",\n    ", $valid_mime_types)."\n);";
-
-    // write mime_types.php config file
-    @file_put_contents('./mime_types.php', $output);
+	$preamble = "<?php\n\n";
+	$preamble .= "/*\n";
+	$preamble .= " * This file is part of SwiftMailer.\n";
+	$preamble .= " * (c) 2004-2009 Chris Corbyn\n *\n";
+	$preamble .= " * For the full copyright and license information, please view the LICENSE\n";
+	$preamble .= " * file that was distributed with this source code.\n *\n";
+	$preamble .= " * autogenerated using https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types\n";
+	$preamble .= " * and https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml\n";
+	$preamble .= " */\n\n";
+	$preamble .= "/*\n";
+	$preamble .= " * List of MIME type automatically detected in Swift Mailer.\n";
+	$preamble .= " */\n\n";
+	$preamble .= "// You may add or take away what you like (lowercase required)\n\n";
+
+	// get current mime types files
+	$mime_types = @file_get_contents(APACHE_MIME_TYPES_URL);
+	$mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
+
+	// prepare valid mime types
+	$valid_mime_types = [];
+
+	// split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
+	if (false !== preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches)) {
+		// collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
+		$valid_mime_types_preset = [
+			'php' => 'application/x-php',
+			'php3' => 'application/x-php',
+			'php4' => 'application/x-php',
+			'php5' => 'application/x-php',
+			'zip' => 'application/zip',
+			'gif' => 'image/gif',
+			'png' => 'image/png',
+			'css' => 'text/css',
+			'js' => 'text/javascript',
+			'txt' => 'text/plain',
+			'aif' => 'audio/x-aiff',
+			'aiff' => 'audio/x-aiff',
+			'avi' => 'video/avi',
+			'bmp' => 'image/bmp',
+			'bz2' => 'application/x-bz2',
+			'csv' => 'text/csv',
+			'dmg' => 'application/x-apple-diskimage',
+			'doc' => 'application/msword',
+			'docx' => 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+			'eml' => 'message/rfc822',
+			'aps' => 'application/postscript',
+			'exe' => 'application/x-ms-dos-executable',
+			'flv' => 'video/x-flv',
+			'gz' => 'application/x-gzip',
+			'hqx' => 'application/stuffit',
+			'htm' => 'text/html',
+			'html' => 'text/html',
+			'jar' => 'application/x-java-archive',
+			'jpeg' => 'image/jpeg',
+			'jpg' => 'image/jpeg',
+			'm3u' => 'audio/x-mpegurl',
+			'm4a' => 'audio/mp4',
+			'mdb' => 'application/x-msaccess',
+			'mid' => 'audio/midi',
+			'midi' => 'audio/midi',
+			'mov' => 'video/quicktime',
+			'mp3' => 'audio/mpeg',
+			'mp4' => 'video/mp4',
+			'mpeg' => 'video/mpeg',
+			'mpg' => 'video/mpeg',
+			'odg' => 'vnd.oasis.opendocument.graphics',
+			'odp' => 'vnd.oasis.opendocument.presentation',
+			'odt' => 'vnd.oasis.opendocument.text',
+			'ods' => 'vnd.oasis.opendocument.spreadsheet',
+			'ogg' => 'audio/ogg',
+			'pdf' => 'application/pdf',
+			'ppt' => 'application/vnd.ms-powerpoint',
+			'pptx' => 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
+			'ps' => 'application/postscript',
+			'rar' => 'application/x-rar-compressed',
+			'rtf' => 'application/rtf',
+			'tar' => 'application/x-tar',
+			'sit' => 'application/x-stuffit',
+			'svg' => 'image/svg+xml',
+			'tif' => 'image/tiff',
+			'tiff' => 'image/tiff',
+			'ttf' => 'application/x-font-truetype',
+			'vcf' => 'text/x-vcard',
+			'wav' => 'audio/wav',
+			'wma' => 'audio/x-ms-wma',
+			'wmv' => 'audio/x-ms-wmv',
+			'xls' => 'application/vnd.ms-excel',
+			'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+			'xml' => 'application/xml',
+		];
+
+		// wrap array for generating file
+		foreach ($valid_mime_types_preset as $extension => $mime_type) {
+			// generate array for mimetype to extension resolver (only first match)
+			$valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
+		}
+
+		// all extensions from second match
+		foreach ($matches[2] as $i => $extensions) {
+			// explode multiple extensions from string
+			$extensions = explode(' ', strtolower($extensions ?? ''));
+
+			// force array for foreach
+			if (!\is_array($extensions)) {
+				$extensions = [$extensions];
+			}
+
+			foreach ($extensions as $extension) {
+				// get mime type
+				$mime_type = $matches[1][$i];
+
+				// check if string length lower than 10
+				if (\strlen($extension) < 10) {
+					if (!isset($valid_mime_types[$mime_type])) {
+						// generate array for mimetype to extension resolver (only first match)
+						$valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
+					}
+				}
+			}
+		}
+	}
+
+	$xml = simplexml_load_string($mime_xml);
+
+	foreach ($xml as $node) {
+		// check if there is no pattern
+		if (!isset($node->glob['pattern'])) {
+			continue;
+		}
+
+		// get all matching extensions from match
+		foreach ((array) $node->glob['pattern'] as $extension) {
+			// skip none glob extensions
+			if (false === strpos($extension ?? '', '.')) {
+				continue;
+			}
+
+			// remove get only last part
+			$extension = explode('.', strtolower($extension ?? ''));
+			$extension = end($extension);
+		}
+
+		if (isset($node->glob['pattern'][0])) {
+			// mime type
+			$mime_type = strtolower((string) $node['type'] ?? '');
+
+			// get first extension
+			$extension = strtolower(trim($node->glob['ddpattern'][0] ?? '', '*.'));
+
+			// skip none glob extensions and check if string length between 1 and 10
+			if (false !== strpos($extension, '.') || \strlen($extension) < 1 || \strlen($extension) > 9) {
+				continue;
+			}
+
+			// check if string length lower than 10
+			if (!isset($valid_mime_types[$mime_type])) {
+				// generate array for mimetype to extension resolver (only first match)
+				$valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
+			}
+		}
+	}
+
+	// full list of valid extensions only
+	$valid_mime_types = array_unique($valid_mime_types);
+	ksort($valid_mime_types);
+
+	// combine mime types and extensions array
+	$output = "$preamble\$swift_mime_types = array(\n    ".implode(",\n    ", $valid_mime_types)."\n);";
+
+	// write mime_types.php config file
+	@file_put_contents('./mime_types.php', $output);
 }
 
 generateUpToDateMimeArray();

htdocs/includes/swiftmailer/lib/dependency_maps/cache_deps.php

Indentation +14 added lines, -14 removed lines

@@ -1,23 +1,23 @@
 <?php
 
 Swift_DependencyContainer::getInstance()
-    ->register('cache')
-    ->asAliasOf('cache.array')
+	->register('cache')
+	->asAliasOf('cache.array')
 
-    ->register('tempdir')
-    ->asValue('/tmp')
+	->register('tempdir')
+	->asValue('/tmp')
 
-    ->register('cache.null')
-    ->asSharedInstanceOf('Swift_KeyCache_NullKeyCache')
+	->register('cache.null')
+	->asSharedInstanceOf('Swift_KeyCache_NullKeyCache')
 
-    ->register('cache.array')
-    ->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
-    ->withDependencies(['cache.inputstream'])
+	->register('cache.array')
+	->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
+	->withDependencies(['cache.inputstream'])
 
-    ->register('cache.disk')
-    ->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
-    ->withDependencies(['cache.inputstream', 'tempdir'])
+	->register('cache.disk')
+	->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
+	->withDependencies(['cache.inputstream', 'tempdir'])
 
-    ->register('cache.inputstream')
-    ->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
+	->register('cache.inputstream')
+	->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
 ;

htdocs/includes/swiftmailer/lib/dependency_maps/mime_deps.php

Indentation +126 added lines, -126 removed lines

@@ -3,132 +3,132 @@
 require __DIR__.'/../mime_types.php';
 
 Swift_DependencyContainer::getInstance()
-    ->register('properties.charset')
-    ->asValue('utf-8')
-
-    ->register('email.validator')
-    ->asSharedInstanceOf('Egulias\EmailValidator\EmailValidator')
-
-    ->register('mime.idgenerator.idright')
-    // As SERVER_NAME can come from the user in certain configurations, check that
-    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
-    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated')
-
-    ->register('mime.idgenerator')
-    ->asSharedInstanceOf('Swift_Mime_IdGenerator')
-    ->withDependencies([
-        'mime.idgenerator.idright',
-    ])
-
-    ->register('mime.message')
-    ->asNewInstanceOf('Swift_Mime_SimpleMessage')
-    ->withDependencies([
-        'mime.headerset',
-        'mime.textcontentencoder',
-        'cache',
-        'mime.idgenerator',
-        'properties.charset',
-    ])
-
-    ->register('mime.part')
-    ->asNewInstanceOf('Swift_Mime_MimePart')
-    ->withDependencies([
-        'mime.headerset',
-        'mime.textcontentencoder',
-        'cache',
-        'mime.idgenerator',
-        'properties.charset',
-    ])
-
-    ->register('mime.attachment')
-    ->asNewInstanceOf('Swift_Mime_Attachment')
-    ->withDependencies([
-        'mime.headerset',
-        'mime.base64contentencoder',
-        'cache',
-        'mime.idgenerator',
-    ])
-    ->addConstructorValue($swift_mime_types)
-
-    ->register('mime.embeddedfile')
-    ->asNewInstanceOf('Swift_Mime_EmbeddedFile')
-    ->withDependencies([
-        'mime.headerset',
-        'mime.base64contentencoder',
-        'cache',
-        'mime.idgenerator',
-    ])
-    ->addConstructorValue($swift_mime_types)
-
-    ->register('mime.headerfactory')
-    ->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
-    ->withDependencies([
-        'mime.qpheaderencoder',
-        'mime.rfc2231encoder',
-        'email.validator',
-        'properties.charset',
-        'address.idnaddressencoder',
-    ])
-
-    ->register('mime.headerset')
-    ->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
-    ->withDependencies(['mime.headerfactory', 'properties.charset'])
-
-    ->register('mime.qpheaderencoder')
-    ->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
-    ->withDependencies(['mime.charstream'])
-
-    ->register('mime.base64headerencoder')
-    ->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
-    ->withDependencies(['mime.charstream'])
-
-    ->register('mime.charstream')
-    ->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
-    ->withDependencies(['mime.characterreaderfactory', 'properties.charset'])
-
-    ->register('mime.bytecanonicalizer')
-    ->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
-    ->addConstructorValue([[0x0D, 0x0A], [0x0D], [0x0A]])
-    ->addConstructorValue([[0x0A], [0x0A], [0x0D, 0x0A]])
-
-    ->register('mime.characterreaderfactory')
-    ->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
-
-    ->register('mime.textcontentencoder')
-    ->asAliasOf('mime.qpcontentencoder')
-
-    ->register('mime.safeqpcontentencoder')
-    ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-    ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
-
-    ->register('mime.rawcontentencoder')
-    ->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
-
-    ->register('mime.nativeqpcontentencoder')
-    ->withDependencies(['properties.charset'])
-    ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
-
-    ->register('mime.qpcontentencoder')
-    ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
-    ->withDependencies(['mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'])
-
-    ->register('mime.7bitcontentencoder')
-    ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
-    ->addConstructorValue('7bit')
-    ->addConstructorValue(true)
-
-    ->register('mime.8bitcontentencoder')
-    ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
-    ->addConstructorValue('8bit')
-    ->addConstructorValue(true)
-
-    ->register('mime.base64contentencoder')
-    ->asSharedInstanceOf('Swift_Mime_ContentEncoder_Base64ContentEncoder')
-
-    ->register('mime.rfc2231encoder')
-    ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
-    ->withDependencies(['mime.charstream'])
+	->register('properties.charset')
+	->asValue('utf-8')
+
+	->register('email.validator')
+	->asSharedInstanceOf('Egulias\EmailValidator\EmailValidator')
+
+	->register('mime.idgenerator.idright')
+	// As SERVER_NAME can come from the user in certain configurations, check that
+	// it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+	// preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+	->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated')
+
+	->register('mime.idgenerator')
+	->asSharedInstanceOf('Swift_Mime_IdGenerator')
+	->withDependencies([
+		'mime.idgenerator.idright',
+	])
+
+	->register('mime.message')
+	->asNewInstanceOf('Swift_Mime_SimpleMessage')
+	->withDependencies([
+		'mime.headerset',
+		'mime.textcontentencoder',
+		'cache',
+		'mime.idgenerator',
+		'properties.charset',
+	])
+
+	->register('mime.part')
+	->asNewInstanceOf('Swift_Mime_MimePart')
+	->withDependencies([
+		'mime.headerset',
+		'mime.textcontentencoder',
+		'cache',
+		'mime.idgenerator',
+		'properties.charset',
+	])
+
+	->register('mime.attachment')
+	->asNewInstanceOf('Swift_Mime_Attachment')
+	->withDependencies([
+		'mime.headerset',
+		'mime.base64contentencoder',
+		'cache',
+		'mime.idgenerator',
+	])
+	->addConstructorValue($swift_mime_types)
+
+	->register('mime.embeddedfile')
+	->asNewInstanceOf('Swift_Mime_EmbeddedFile')
+	->withDependencies([
+		'mime.headerset',
+		'mime.base64contentencoder',
+		'cache',
+		'mime.idgenerator',
+	])
+	->addConstructorValue($swift_mime_types)
+
+	->register('mime.headerfactory')
+	->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
+	->withDependencies([
+		'mime.qpheaderencoder',
+		'mime.rfc2231encoder',
+		'email.validator',
+		'properties.charset',
+		'address.idnaddressencoder',
+	])
+
+	->register('mime.headerset')
+	->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
+	->withDependencies(['mime.headerfactory', 'properties.charset'])
+
+	->register('mime.qpheaderencoder')
+	->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
+	->withDependencies(['mime.charstream'])
+
+	->register('mime.base64headerencoder')
+	->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
+	->withDependencies(['mime.charstream'])
+
+	->register('mime.charstream')
+	->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
+	->withDependencies(['mime.characterreaderfactory', 'properties.charset'])
+
+	->register('mime.bytecanonicalizer')
+	->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
+	->addConstructorValue([[0x0D, 0x0A], [0x0D], [0x0A]])
+	->addConstructorValue([[0x0A], [0x0A], [0x0D, 0x0A]])
+
+	->register('mime.characterreaderfactory')
+	->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
+
+	->register('mime.textcontentencoder')
+	->asAliasOf('mime.qpcontentencoder')
+
+	->register('mime.safeqpcontentencoder')
+	->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
+	->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
+
+	->register('mime.rawcontentencoder')
+	->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
+
+	->register('mime.nativeqpcontentencoder')
+	->withDependencies(['properties.charset'])
+	->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
+
+	->register('mime.qpcontentencoder')
+	->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
+	->withDependencies(['mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'])
+
+	->register('mime.7bitcontentencoder')
+	->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
+	->addConstructorValue('7bit')
+	->addConstructorValue(true)
+
+	->register('mime.8bitcontentencoder')
+	->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
+	->addConstructorValue('8bit')
+	->addConstructorValue(true)
+
+	->register('mime.base64contentencoder')
+	->asSharedInstanceOf('Swift_Mime_ContentEncoder_Base64ContentEncoder')
+
+	->register('mime.rfc2231encoder')
+	->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
+	->withDependencies(['mime.charstream'])
 ;
 
 unset($swift_mime_types);

htdocs/includes/swiftmailer/lib/dependency_maps/message_deps.php

Indentation +4 added lines, -4 removed lines

@@ -1,9 +1,9 @@
 <?php
 
 Swift_DependencyContainer::getInstance()
-    ->register('message.message')
-    ->asNewInstanceOf('Swift_Message')
+	->register('message.message')
+	->asNewInstanceOf('Swift_Message')
 
-    ->register('message.mimepart')
-    ->asNewInstanceOf('Swift_MimePart')
+	->register('message.mimepart')
+	->asNewInstanceOf('Swift_MimePart')
 ;

htdocs/includes/swiftmailer/lib/dependency_maps/transport_deps.php

Indentation +93 added lines, -93 removed lines

@@ -1,97 +1,97 @@
 <?php
 
 Swift_DependencyContainer::getInstance()
-    ->register('transport.localdomain')
-    // As SERVER_NAME can come from the user in certain configurations, check that
-    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
-    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
-    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
-
-    ->register('transport.smtp')
-    ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
-    ->withDependencies([
-        'transport.buffer',
-        'transport.smtphandlers',
-        'transport.eventdispatcher',
-        'transport.localdomain',
-        'address.idnaddressencoder',
-    ])
-
-    ->register('transport.sendmail')
-    ->asNewInstanceOf('Swift_Transport_SendmailTransport')
-    ->withDependencies([
-        'transport.buffer',
-        'transport.eventdispatcher',
-        'transport.localdomain',
-    ])
-
-    ->register('transport.loadbalanced')
-    ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
-
-    ->register('transport.failover')
-    ->asNewInstanceOf('Swift_Transport_FailoverTransport')
-
-    ->register('transport.spool')
-    ->asNewInstanceOf('Swift_Transport_SpoolTransport')
-    ->withDependencies(['transport.eventdispatcher'])
-
-    ->register('transport.null')
-    ->asNewInstanceOf('Swift_Transport_NullTransport')
-    ->withDependencies(['transport.eventdispatcher'])
-
-    ->register('transport.buffer')
-    ->asNewInstanceOf('Swift_Transport_StreamBuffer')
-    ->withDependencies(['transport.replacementfactory'])
-
-    ->register('transport.smtphandlers')
-    ->asArray()
-    ->withDependencies(['transport.authhandler'])
-
-    ->register('transport.authhandler')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
-    ->withDependencies(['transport.authhandlers'])
-
-    ->register('transport.authhandlers')
-    ->asArray()
-    ->withDependencies([
-        'transport.crammd5auth',
-        'transport.loginauth',
-        'transport.plainauth',
-        'transport.ntlmauth',
-        'transport.xoauth2auth',
-    ])
-
-    ->register('transport.smtputf8handler')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_SmtpUtf8Handler')
-
-    ->register('transport.8bitmimehandler')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_EightBitMimeHandler')
-    ->addConstructorValue('8BITMIME')
-
-    ->register('transport.crammd5auth')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
-
-    ->register('transport.loginauth')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_LoginAuthenticator')
-
-    ->register('transport.plainauth')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator')
-
-    ->register('transport.xoauth2auth')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_XOAuth2Authenticator')
-
-    ->register('transport.ntlmauth')
-    ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_NTLMAuthenticator')
-
-    ->register('transport.eventdispatcher')
-    ->asNewInstanceOf('Swift_Events_SimpleEventDispatcher')
-
-    ->register('transport.replacementfactory')
-    ->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
-
-    ->register('address.idnaddressencoder')
-    ->asNewInstanceOf('Swift_AddressEncoder_IdnAddressEncoder')
-
-    ->register('address.utf8addressencoder')
-    ->asNewInstanceOf('Swift_AddressEncoder_Utf8AddressEncoder')
+	->register('transport.localdomain')
+	// As SERVER_NAME can come from the user in certain configurations, check that
+	// it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+	// preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+	->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
+
+	->register('transport.smtp')
+	->asNewInstanceOf('Swift_Transport_EsmtpTransport')
+	->withDependencies([
+		'transport.buffer',
+		'transport.smtphandlers',
+		'transport.eventdispatcher',
+		'transport.localdomain',
+		'address.idnaddressencoder',
+	])
+
+	->register('transport.sendmail')
+	->asNewInstanceOf('Swift_Transport_SendmailTransport')
+	->withDependencies([
+		'transport.buffer',
+		'transport.eventdispatcher',
+		'transport.localdomain',
+	])
+
+	->register('transport.loadbalanced')
+	->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
+
+	->register('transport.failover')
+	->asNewInstanceOf('Swift_Transport_FailoverTransport')
+
+	->register('transport.spool')
+	->asNewInstanceOf('Swift_Transport_SpoolTransport')
+	->withDependencies(['transport.eventdispatcher'])
+
+	->register('transport.null')
+	->asNewInstanceOf('Swift_Transport_NullTransport')
+	->withDependencies(['transport.eventdispatcher'])
+
+	->register('transport.buffer')
+	->asNewInstanceOf('Swift_Transport_StreamBuffer')
+	->withDependencies(['transport.replacementfactory'])
+
+	->register('transport.smtphandlers')
+	->asArray()
+	->withDependencies(['transport.authhandler'])
+
+	->register('transport.authhandler')
+	->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
+	->withDependencies(['transport.authhandlers'])
+
+	->register('transport.authhandlers')
+	->asArray()
+	->withDependencies([
+		'transport.crammd5auth',
+		'transport.loginauth',
+		'transport.plainauth',
+		'transport.ntlmauth',
+		'transport.xoauth2auth',
+	])
+
+	->register('transport.smtputf8handler')
+	->asNewInstanceOf('Swift_Transport_Esmtp_SmtpUtf8Handler')
+
+	->register('transport.8bitmimehandler')
+	->asNewInstanceOf('Swift_Transport_Esmtp_EightBitMimeHandler')
+	->addConstructorValue('8BITMIME')
+
+	->register('transport.crammd5auth')
+	->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
+
+	->register('transport.loginauth')
+	->asNewInstanceOf('Swift_Transport_Esmtp_Auth_LoginAuthenticator')
+
+	->register('transport.plainauth')
+	->asNewInstanceOf('Swift_Transport_Esmtp_Auth_PlainAuthenticator')
+
+	->register('transport.xoauth2auth')
+	->asNewInstanceOf('Swift_Transport_Esmtp_Auth_XOAuth2Authenticator')
+
+	->register('transport.ntlmauth')
+	->asNewInstanceOf('Swift_Transport_Esmtp_Auth_NTLMAuthenticator')
+
+	->register('transport.eventdispatcher')
+	->asNewInstanceOf('Swift_Events_SimpleEventDispatcher')
+
+	->register('transport.replacementfactory')
+	->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+
+	->register('address.idnaddressencoder')
+	->asNewInstanceOf('Swift_AddressEncoder_IdnAddressEncoder')
+
+	->register('address.utf8addressencoder')
+	->asNewInstanceOf('Swift_AddressEncoder_Utf8AddressEncoder')
 ;

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

Indentation +9 added lines, -9 removed lines

@@ -15,13 +15,13 @@
  */
 class Swift_RfcComplianceException extends Swift_SwiftException
 {
-    /**
-     * Create a new RfcComplianceException with $message.
-     *
-     * @param string $message
-     */
-    public function __construct($message)
-    {
-        parent::__construct($message);
-    }
+	/**
+	 * Create a new RfcComplianceException with $message.
+	 *
+	 * @param string $message
+	 */
+	public function __construct($message)
+	{
+		parent::__construct($message);
+	}
 }

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

Indentation +16 added lines, -16 removed lines

@@ -15,21 +15,21 @@
  */
 interface Swift_StreamFilter
 {
-    /**
-     * Based on the buffer given, this returns true if more buffering is needed.
-     *
-     * @param mixed $buffer
-     *
-     * @return bool
-     */
-    public function shouldBuffer($buffer);
+	/**
+	 * Based on the buffer given, this returns true if more buffering is needed.
+	 *
+	 * @param mixed $buffer
+	 *
+	 * @return bool
+	 */
+	public function shouldBuffer($buffer);
 
-    /**
-     * Filters $buffer and returns the changes.
-     *
-     * @param mixed $buffer
-     *
-     * @return mixed
-     */
-    public function filter($buffer);
+	/**
+	 * Filters $buffer and returns the changes.
+	 *
+	 * @param mixed $buffer
+	 *
+	 * @return mixed
+	 */
+	public function filter($buffer);
 }