Dolibarr / dolibarr

htdocs/includes/odtphp/odf.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -499,7 +499,7 @@
 		$height *= self::PIXEL_TO_CM;
 		$xml = <<<IMG
 			<draw:frame draw:style-name="fr1" draw:name="$filename" text:anchor-type="aschar" svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
-IMG;
+img;
 		$this->images[$value] = $file;
 		$this->setVars($key, $xml, false);
 		return $this;

Braces +31 added lines, -10 removed lines

@@ -78,7 +78,10 @@ 
 		}
 
 		$md5uniqid = md5(uniqid());
-		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);	// Remove last \ or /
+		if ($this->config['PATH_TO_TMP']) {
+			$this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);
+		}
+		// Remove last \ or /
 		$this->tmpdir .= ($this->tmpdir?'/':'').$md5uniqid;
 		$this->tmpfile = $this->tmpdir.'/'.$md5uniqid.'.odt';	// We keep .odt extension to allow OpenOffice usage during debug.
 
@@ -94,7 +97,9 @@ 
 
 		// Load zip proxy
 		$zipHandler = $this->config['ZIP_PROXY'];
-		if (!defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
+		if (!defined('PCLZIP_TEMPORARY_DIR')) {
+			define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
+		}
 		include_once 'zip/'.$zipHandler.'.php';
 		if (! class_exists($this->config['ZIP_PROXY'])) {
 			throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
@@ -236,8 +241,12 @@ 
 	 */
 	private function _replaceHtmlWithOdtTag($tags, &$customStyles, &$fontDeclarations, $encode = false, $charset = '')
 	{
-		if ($customStyles == null) $customStyles = array();
-		if ($fontDeclarations == null) $fontDeclarations = array();
+		if ($customStyles == null) {
+			$customStyles = array();
+		}
+		if ($fontDeclarations == null) {
+			$fontDeclarations = array();
+		}
 
 		$odtResult = '';
 
@@ -595,7 +604,9 @@ 
 				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
 				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-					if (!empty($match[3])) $this->contentXml = str_replace($match[0], $match[3], $this->contentXml);
+					if (!empty($match[3])) {
+						$this->contentXml = str_replace($match[0], $match[3], $this->contentXml);
+					}
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$this->contentXml = preg_replace($reg, '', $this->contentXml);
@@ -608,9 +619,15 @@ 
 		}
 
 		// Static substitution
-		if ($type == 'content')	$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
-		if ($type == 'styles')	$this->stylesXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->stylesXml);
-		if ($type == 'meta')	$this->metaXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->metaXml);
+		if ($type == 'content') {
+			$this->contentXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->contentXml);
+		}
+		if ($type == 'styles') {
+			$this->stylesXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->stylesXml);
+		}
+		if ($type == 'meta') {
+			$this->metaXml = str_replace(array_keys($this->vars), array_values($this->vars), $this->metaXml);
+		}
 	}
 
 	/**
@@ -751,7 +768,9 @@ 
 	 */
 	public function setMetaData()
 	{
-		if (empty($this->creator)) $this->creator='';
+		if (empty($this->creator)) {
+			$this->creator='';
+		}
 
 		$this->metaXml = preg_replace('/<dc:date>.*<\/dc:date>/', '<dc:date>'.gmdate("Y-m-d\TH:i:s").'</dc:date>', $this->metaXml);
 		$this->metaXml = preg_replace('/<dc:creator>.*<\/dc:creator>/', '<dc:creator>'.htmlspecialchars($this->creator).'</dc:creator>', $this->metaXml);
@@ -819,7 +838,9 @@ 
 	{
 		global $conf;
 
-		if ( $name == "" ) $name = "temp".md5(uniqid());
+		if ( $name == "" ) {
+			$name = "temp".md5(uniqid());
+		}
 
 		dol_syslog(get_class($this).'::exportAsAttachedPDF $name='.$name, LOG_DEBUG);
 		$this->saveToDisk($name);

Spacing +83 added lines, -83 removed lines

@@ -31,18 +31,18 @@ 
 class Odf
 {
 	protected $config = array(
-		'ZIP_PROXY' => 'PclZipProxy',	// PclZipProxy, PhpZipProxy
+		'ZIP_PROXY' => 'PclZipProxy', // PclZipProxy, PhpZipProxy
 		'DELIMITER_LEFT' => '{',
 		'DELIMITER_RIGHT' => '}',
 		'PATH_TO_TMP' => '/tmp'
 	);
 	protected $file;
-	protected $contentXml;			// To store content of content.xml file
-	protected $metaXml;			    // To store content of meta.xml file
-	protected $stylesXml;			// To store content of styles.xml file
-	protected $manifestXml;			// To store content of META-INF/manifest.xml file
+	protected $contentXml; // To store content of content.xml file
+	protected $metaXml; // To store content of meta.xml file
+	protected $stylesXml; // To store content of styles.xml file
+	protected $manifestXml; // To store content of META-INF/manifest.xml file
 	protected $tmpfile;
-	protected $tmpdir='';
+	protected $tmpdir = '';
 	protected $images = array();
 	protected $vars = array();
 	protected $segments = array();
@@ -50,7 +50,7 @@ 
 	public $creator;
 	public $title;
 	public $subject;
-	public $userdefined=array();
+	public $userdefined = array();
 
 	const PIXEL_TO_CM = 0.026458333;
 	const FIND_TAGS_REGEX = '/<([A-Za-z0-9]+)(?:\s([A-Za-z]+(?:\-[A-Za-z]+)?(?:=(?:".*?")|(?:[0-9]+))))*(?:(?:\s\/>)|(?:>(.*)<\/\1>))/s';
@@ -68,7 +68,7 @@ 
 	{
 		clearstatcache();
 
-		if (! is_array($config)) {
+		if (!is_array($config)) {
 			throw new OdfException('Configuration data must be provided as array');
 		}
 		foreach ($config as $configKey => $configValue) {
@@ -78,12 +78,12 @@ 
 		}
 
 		$md5uniqid = md5(uniqid());
-		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);	// Remove last \ or /
-		$this->tmpdir .= ($this->tmpdir?'/':'').$md5uniqid;
-		$this->tmpfile = $this->tmpdir.'/'.$md5uniqid.'.odt';	// We keep .odt extension to allow OpenOffice usage during debug.
+		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']); // Remove last \ or /
+		$this->tmpdir .= ($this->tmpdir ? '/' : '').$md5uniqid;
+		$this->tmpfile = $this->tmpdir.'/'.$md5uniqid.'.odt'; // We keep .odt extension to allow OpenOffice usage during debug.
 
 		// A working directory is required for some zip proxy like PclZipProxy
-		if (in_array($this->config['ZIP_PROXY'], array('PclZipProxy')) && ! is_dir($this->config['PATH_TO_TMP'])) {
+		if (in_array($this->config['ZIP_PROXY'], array('PclZipProxy')) && !is_dir($this->config['PATH_TO_TMP'])) {
 			throw new OdfException('Temporary directory '.$this->config['PATH_TO_TMP'].' must exists');
 		}
 
@@ -96,8 +96,8 @@ 
 		$zipHandler = $this->config['ZIP_PROXY'];
 		if (!defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
 		include_once 'zip/'.$zipHandler.'.php';
-		if (! class_exists($this->config['ZIP_PROXY'])) {
-			throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
+		if (!class_exists($this->config['ZIP_PROXY'])) {
+			throw new OdfException($this->config['ZIP_PROXY'].' class not found - check your php settings');
 		}
 		$this->file = new $zipHandler($this->tmpdir);
 
@@ -144,7 +144,7 @@ 
 	 */
 	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
 	{
-		$tag = $this->config['DELIMITER_LEFT'] . $key . $this->config['DELIMITER_RIGHT'];
+		$tag = $this->config['DELIMITER_LEFT'].$key.$this->config['DELIMITER_RIGHT'];
 
 		// TODO Warning string may be:
 		// <text:span text:style-name="T13">{</text:span><text:span text:style-name="T12">aaa</text:span><text:span text:style-name="T13">}</text:span>
@@ -179,7 +179,7 @@ 
 
 		// Check if the value includes html tags
 		if ($this->_hasHtmlTag($value) === true) {
-			$value = strip_tags($value, '<br><strong><b><i><em><u><s><sub><sup><span>');	// remove html tags except the one into the list in second parameter
+			$value = strip_tags($value, '<br><strong><b><i><em><u><s><sub><sup><span>'); // remove html tags except the one into the list in second parameter
 
 			// Default styles for strong/b, i/em, u, s, sub & sup
 			$automaticStyles = array(
@@ -197,7 +197,7 @@ 
 			$convertedValue = $this->_replaceHtmlWithOdtTag($this->_getDataFromHtml($value), $customStyles, $fontDeclarations, $encode, $charset);
 
 			foreach ($customStyles as $key => $val) {
-				array_push($automaticStyles, '<style:style style:name="customStyle' . $key . '" style:family="text">' . $val . '</style:style>');
+				array_push($automaticStyles, '<style:style style:name="customStyle'.$key.'" style:family="text">'.$val.'</style:style>');
 			}
 
 			// Join the styles and add them to the content xml
@@ -207,16 +207,16 @@ 
 					$styles .= $style;
 				}
 			}
-			$this->contentXml = str_replace('</office:automatic-styles>', $styles . '</office:automatic-styles>', $this->contentXml);
+			$this->contentXml = str_replace('</office:automatic-styles>', $styles.'</office:automatic-styles>', $this->contentXml);
 
 			// Join the font declarations and add them to the content xml
 			$fonts = '';
 			foreach ($fontDeclarations as $font) {
-				if (strpos($this->contentXml, 'style:name="' . $font . '"') === false) {
-					$fonts .= '<style:font-face style:name="' . $font . '" svg:font-family="\'' . $font . '\'" />';
+				if (strpos($this->contentXml, 'style:name="'.$font.'"') === false) {
+					$fonts .= '<style:font-face style:name="'.$font.'" svg:font-family="\''.$font.'\'" />';
 				}
 			}
-			$this->contentXml = str_replace('</office:font-face-decls>', $fonts . '</office:font-face-decls>', $this->contentXml);
+			$this->contentXml = str_replace('</office:font-face-decls>', $fonts.'</office:font-face-decls>', $this->contentXml);
 		} else {
 			$convertedValue = $this->encode_chars($convertedValue, $encode, $charset);
 			$convertedValue = preg_replace('/(\r\n|\r|\n)/i', "<text:line-break/>", $convertedValue);
@@ -253,23 +253,23 @@ 
 						break;
 					case 'strong':
 					case 'b':
-						$odtResult .= '<text:span text:style-name="boldText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="boldText">'.($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)).'</text:span>';
 						break;
 					case 'i':
 					case 'em':
-						$odtResult .= '<text:span text:style-name="italicText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="italicText">'.($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)).'</text:span>';
 						break;
 					case 'u':
-						$odtResult .= '<text:span text:style-name="underlineText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="underlineText">'.($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)).'</text:span>';
 						break;
 					case 's':
-						$odtResult .= '<text:span text:style-name="strikethroughText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="strikethroughText">'.($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)).'</text:span>';
 						break;
 					case 'sub':
-						$odtResult .= '<text:span text:style-name="subText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="subText">'.($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)).'</text:span>';
 						break;
 					case 'sup':
-						$odtResult .= '<text:span text:style-name="supText">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+						$odtResult .= '<text:span text:style-name="supText">'.($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)).'</text:span>';
 						break;
 					case 'span':
 						if (isset($tag['attributes']['style'])) {
@@ -284,7 +284,7 @@ 
 										if (!in_array($fontName, $fontDeclarations)) {
 											array_push($fontDeclarations, $fontName);
 										}
-										$odtStyles .= '<style:text-properties style:font-name="' . $fontName . '" />';
+										$odtStyles .= '<style:text-properties style:font-name="'.$fontName.'" />';
 										break;
 									case 'font-size':
 										if (preg_match('/([0-9]+)\s?(px|pt)/', $styleValue, $matches)) {
@@ -292,12 +292,12 @@ 
 											if ($matches[2] == 'px') {
 												$fontSize = round($fontSize * 0.75);
 											}
-											$odtStyles .= '<style:text-properties fo:font-size="' . $fontSize . 'pt" style:font-size-asian="' . $fontSize . 'pt" style:font-size-complex="' . $fontSize . 'pt" />';
+											$odtStyles .= '<style:text-properties fo:font-size="'.$fontSize.'pt" style:font-size-asian="'.$fontSize.'pt" style:font-size-complex="'.$fontSize.'pt" />';
 										}
 										break;
 									case 'color':
 										if (preg_match('/#[0-9A-Fa-f]{3}(?:[0-9A-Fa-f]{3})?/', $styleValue)) {
-											$odtStyles .= '<style:text-properties fo:color="' . $styleValue . '" />';
+											$odtStyles .= '<style:text-properties fo:color="'.$styleValue.'" />';
 										}
 										break;
 								}
@@ -306,7 +306,7 @@ 
 								// Generate a unique id for the style (using microtime and random because some CPUs are really fast...)
 								$key = floatval(str_replace('.', '', microtime(true))) + rand(0, 10);
 								$customStyles[$key] = $odtStyles;
-								$odtResult .= '<text:span text:style-name="customStyle' . $key . '">' . ($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)) . '</text:span>';
+								$odtResult .= '<text:span text:style-name="customStyle'.$key.'">'.($tag['children'] != null ? $this->_replaceHtmlWithOdtTag($tag['children'], $customStyles, $fontDeclarations, $encode) : $this->encode_chars($tag['innerText'], $encode, $charset)).'</text:span>';
 							}
 						}
 						break;
@@ -443,24 +443,24 @@ 
 	public function htmlToUTFAndPreOdf($value)
 	{
 		// We decode into utf8, entities
-		$value=dol_html_entity_decode($value, ENT_QUOTES|ENT_HTML5);
+		$value = dol_html_entity_decode($value, ENT_QUOTES | ENT_HTML5);
 
 		// We convert html tags
-		$ishtml=dol_textishtml($value);
+		$ishtml = dol_textishtml($value);
 		if ($ishtml) {
 			// If string is "MYPODUCT - Desc <strong>bold</strong> with &eacute; accent<br />\n<br />\nUn texto en espa&ntilde;ol ?"
 			// Result after clean must be "MYPODUCT - Desc bold with é accent\n\nUn texto en espa&ntilde;ol ?"
 
 			// We want to ignore \n and we want all <br> to be \n
-			$value=preg_replace('/(\r\n|\r|\n)/i', '', $value);
-			$value=preg_replace('/<br>/i', "\n", $value);
-			$value=preg_replace('/<br\s+[^<>\/]*>/i', "\n", $value);
-			$value=preg_replace('/<br\s+[^<>\/]*\/>/i', "\n", $value);
+			$value = preg_replace('/(\r\n|\r|\n)/i', '', $value);
+			$value = preg_replace('/<br>/i', "\n", $value);
+			$value = preg_replace('/<br\s+[^<>\/]*>/i', "\n", $value);
+			$value = preg_replace('/<br\s+[^<>\/]*\/>/i', "\n", $value);
 
 			//$value=preg_replace('/<strong>/','__lt__text:p text:style-name=__quot__bold__quot____gt__',$value);
 			//$value=preg_replace('/<\/strong>/','__lt__/text:p__gt__',$value);
 
-			$value=dol_string_nohtmltag($value, 0);
+			$value = dol_string_nohtmltag($value, 0);
 		}
 
 		return $value;
@@ -536,10 +536,10 @@ 
 				$balise = str_replace('row.', '', $matches2[1]);
 				// Move segment tags around the row
 				$replace = array(
-					'[!-- BEGIN ' . $matches2[1] . ' --]'	=> '',
-					'[!-- END ' . $matches2[1] . ' --]'		=> '',
-					'<table:table-row'							=> '[!-- BEGIN ' . $balise . ' --]<table:table-row',
-					'</table:table-row>'						=> '</table:table-row>[!-- END ' . $balise . ' --]'
+					'[!-- BEGIN '.$matches2[1].' --]'	=> '',
+					'[!-- END '.$matches2[1].' --]'		=> '',
+					'<table:table-row'							=> '[!-- BEGIN '.$balise.' --]<table:table-row',
+					'</table:table-row>'						=> '</table:table-row>[!-- END '.$balise.' --]'
 				);
 				$replacedXML = str_replace(array_keys($replace), array_values($replace), $matches[0][$i]);
 				$this->contentXml = str_replace($matches[0][$i], $replacedXML, $this->contentXml);
@@ -557,14 +557,14 @@ 
 	private function _parse($type = 'content')
 	{
 		// Search all tags found into condition to complete $this->vars, so we will proceed all tests even if not defined
-		$reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
+		$reg = '@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
 		$matches = array();
 		preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
 
 		//var_dump($this->vars);exit;
 		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
-			if (! empty($match[1]) && ! isset($this->vars[$match[1]])) {
-				$this->vars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
+			if (!empty($match[1]) && !isset($this->vars[$match[1]])) {
+				$this->vars[$match[1]] = ''; // Not defined, so we set it to '', we just need entry into this->vars for next loop
 			}
 		}
 		//var_dump($this->vars);exit;
@@ -579,7 +579,7 @@ 
 				// Remove the IF tag
 				$this->contentXml = str_replace('[!-- IF '.$key.' --]', '', $this->contentXml);
 				// Remove everything between the ELSE tag (if it exists) and the ENDIF tag
-				$reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$reg = '@(\[!--\sELSE\s'.$key.'\s--\](.*))?\[!--\sENDIF\s'.$key.'\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				$this->contentXml = preg_replace($reg, '', $this->contentXml);
 				/*if ($sav != $this->contentXml)
 				 {
@@ -592,7 +592,7 @@ 
 				//dol_syslog("Var ".$key." is not defined, we remove the IF, ELSE and ENDIF ");
 				//$sav=$this->contentXml;
 				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
-				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$reg = '@\[!--\sIF\s'.$key.'\s--\](.*)(\[!--\sELSE\s'.$key.'\s--\](.*))?\[!--\sENDIF\s'.$key.'\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->contentXml, $matches, PREG_SET_ORDER);
 				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
 					if (!empty($match[3])) $this->contentXml = str_replace($match[0], $match[3], $this->contentXml);
@@ -622,12 +622,12 @@ 
 	 */
 	public function mergeSegment(Segment $segment)
 	{
-		if (! array_key_exists($segment->getName(), $this->segments)) {
-			throw new OdfException($segment->getName() . 'cannot be parsed, has it been set yet ?');
+		if (!array_key_exists($segment->getName(), $this->segments)) {
+			throw new OdfException($segment->getName().'cannot be parsed, has it been set yet ?');
 		}
 		$string = $segment->getName();
 		// $reg = '@<text:p[^>]*>\[!--\sBEGIN\s' . $string . '\s--\](.*)\[!--.+END\s' . $string . '\s--\]<\/text:p>@smU';
-		$reg = '@\[!--\sBEGIN\s' . $string . '\s--\](.*)\[!--.+END\s' . $string . '\s--\]@smU';
+		$reg = '@\[!--\sBEGIN\s'.$string.'\s--\](.*)\[!--.+END\s'.$string.'\s--\]@smU';
 		$this->contentXml = preg_replace($reg, $segment->getXmlParsed(), $this->contentXml);
 		return $this;
 	}
@@ -639,7 +639,7 @@ 
 	 */
 	public function printVars()
 	{
-		return print_r('<pre>' . print_r($this->vars, true) . '</pre>', true);
+		return print_r('<pre>'.print_r($this->vars, true).'</pre>', true);
 	}
 
 	/**
@@ -660,7 +660,7 @@ 
 	 */
 	public function printDeclaredSegments()
 	{
-		return '<pre>' . print_r(implode(' ', array_keys($this->segments)), true) . '</pre>';
+		return '<pre>'.print_r(implode(' ', array_keys($this->segments)), true).'</pre>';
 	}
 
 	/**
@@ -696,7 +696,7 @@ 
 	{
 		if ($file !== null && is_string($file)) {
 			if (file_exists($file) && !(is_file($file) && is_writable($file))) {
-				throw new OdfException('Permission denied : can\'t create ' . $file);
+				throw new OdfException('Permission denied : can\'t create '.$file);
 			}
 			$this->_save();
 			copy($this->tmpfile, $file);
@@ -713,7 +713,7 @@ 
 	 */
 	private function _save()
 	{
-		$res=$this->file->open($this->tmpfile);    // tmpfile is odt template
+		$res = $this->file->open($this->tmpfile); // tmpfile is odt template
 		$this->_parse('content');
 		$this->_parse('styles');
 		$this->_parse('meta');
@@ -721,23 +721,23 @@ 
 		$this->setMetaData();
 		//print $this->metaXml;exit;
 
-		if (! $this->file->addFromString('content.xml', $this->contentXml)) {
+		if (!$this->file->addFromString('content.xml', $this->contentXml)) {
 			throw new OdfException('Error during file export addFromString content');
 		}
-		if (! $this->file->addFromString('meta.xml', $this->metaXml)) {
+		if (!$this->file->addFromString('meta.xml', $this->metaXml)) {
 			throw new OdfException('Error during file export addFromString meta');
 		}
-		if (! $this->file->addFromString('styles.xml', $this->stylesXml)) {
+		if (!$this->file->addFromString('styles.xml', $this->stylesXml)) {
 			throw new OdfException('Error during file export addFromString styles');
 		}
 
 		foreach ($this->images as $imageKey => $imageValue) {
 			// Add the image inside the ODT document
-			$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
+			$this->file->addFile($imageKey, 'Pictures/'.$imageValue);
 			// Add the image to the Manifest (which maintains a list of images, necessary to avoid "Corrupt ODT file. Repair?" when opening the file with LibreOffice)
 			$this->addImageToManifest($imageValue);
 		}
-		if (! $this->file->addFromString('./META-INF/manifest.xml', $this->manifestXml)) {
+		if (!$this->file->addFromString('./META-INF/manifest.xml', $this->manifestXml)) {
 			throw new OdfException('Error during file export: manifest.xml');
 		}
 		$this->file->close();
@@ -751,7 +751,7 @@ 
 	 */
 	public function setMetaData()
 	{
-		if (empty($this->creator)) $this->creator='';
+		if (empty($this->creator)) $this->creator = '';
 
 		$this->metaXml = preg_replace('/<dc:date>.*<\/dc:date>/', '<dc:date>'.gmdate("Y-m-d\TH:i:s").'</dc:date>', $this->metaXml);
 		$this->metaXml = preg_replace('/<dc:creator>.*<\/dc:creator>/', '<dc:creator>'.htmlspecialchars($this->creator).'</dc:creator>', $this->metaXml);
@@ -797,8 +797,8 @@ 
 			throw new OdfException("headers already sent ($filename at $linenum)");
 		}
 
-		if ( $name == "" ) {
-			$name = md5(uniqid()) . ".odt";
+		if ($name == "") {
+			$name = md5(uniqid()).".odt";
 		}
 
 		header('Content-type: application/vnd.oasis.opendocument.text');
@@ -819,18 +819,18 @@ 
 	{
 		global $conf;
 
-		if ( $name == "" ) $name = "temp".md5(uniqid());
+		if ($name == "") $name = "temp".md5(uniqid());
 
 		dol_syslog(get_class($this).'::exportAsAttachedPDF $name='.$name, LOG_DEBUG);
 		$this->saveToDisk($name);
 
-		$execmethod=(empty($conf->global->MAIN_EXEC_USE_POPEN)?1:2);	// 1 or 2
+		$execmethod = (empty($conf->global->MAIN_EXEC_USE_POPEN) ? 1 : 2); // 1 or 2
 		// Method 1 sometimes hang the server.
 
 
 		// Export to PDF using LibreOffice
 		if (getDolGlobalString('MAIN_ODT_AS_PDF') == 'libreoffice') {
-			dol_mkdir($conf->user->dir_temp);	// We must be sure the directory exists and is writable
+			dol_mkdir($conf->user->dir_temp); // We must be sure the directory exists and is writable
 
 			// We delete and recreate a subdir because the soffice may have change pemrissions on it
 			dol_delete_dir_recursive($conf->user->dir_temp.'/odtaspdf');
@@ -840,7 +840,7 @@ 
 			// using windows libreoffice that must be in path
 			// using linux/mac libreoffice that must be in path
 			// Note PHP Config "fastcgi.impersonate=0" must set to 0 - Default is 1
-			$command ='soffice --headless -env:UserInstallation=file:\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			$command = 'soffice --headless -env:UserInstallation=file:\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '.escapeshellarg(dirname($name))." ".escapeshellarg($name);
 		} elseif (preg_match('/unoconv/', getDolGlobalString('MAIN_ODT_AS_PDF'))) {
 			// If issue with unoconv, see https://github.com/dagwieers/unoconv/issues/87
 
@@ -870,13 +870,13 @@ 
 			//$command = '/usr/bin/unoconv -vvv '.escapeshellcmd($name);
 		} else {
 			// deprecated old method using odt2pdf.sh (native, jodconverter, ...)
-			$tmpname=preg_replace('/\.odt/i', '', $name);
+			$tmpname = preg_replace('/\.odt/i', '', $name);
 
 			if (getDolGlobalString('MAIN_DOL_SCRIPTS_ROOT')) {
-				$command = getDolGlobalString('MAIN_DOL_SCRIPTS_ROOT').'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric(getDolGlobalString('MAIN_ODT_AS_PDF'))?'jodconverter':getDolGlobalString('MAIN_ODT_AS_PDF'));
+				$command = getDolGlobalString('MAIN_DOL_SCRIPTS_ROOT').'/scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric(getDolGlobalString('MAIN_ODT_AS_PDF')) ? 'jodconverter' : getDolGlobalString('MAIN_ODT_AS_PDF'));
 			} else {
 				dol_syslog(get_class($this).'::exportAsAttachedPDF is used but the constant MAIN_DOL_SCRIPTS_ROOT with path to script directory was not defined.', LOG_WARNING);
-				$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric(getDolGlobalString('MAIN_ODT_AS_PDF'))?'jodconverter':getDolGlobalString('MAIN_ODT_AS_PDF'));
+				$command = '../../scripts/odt2pdf/odt2pdf.sh '.escapeshellcmd($tmpname).' '.(is_numeric(getDolGlobalString('MAIN_ODT_AS_PDF')) ? 'jodconverter' : getDolGlobalString('MAIN_ODT_AS_PDF'));
 			}
 		}
 
@@ -889,14 +889,14 @@ 
 		// $result = $utils->executeCLI($command, $outputfile);  and replace test on $execmethod.
 		// $retval will be $result['result']
 		// $errorstring will be $result['output']
-		$retval=0; $output_arr=array();
+		$retval = 0; $output_arr = array();
 		if ($execmethod == 1) {
 			exec($command, $output_arr, $retval);
 		}
 		if ($execmethod == 2) {
 			$outputfile = DOL_DATA_ROOT.'/odt2pdf.log';
 
-			$ok=0;
+			$ok = 0;
 			$handle = fopen($outputfile, 'w');
 			if ($handle) {
 				dol_syslog(get_class($this)."Run command ".$command, LOG_DEBUG);
@@ -905,7 +905,7 @@ 
 				while (!feof($handlein)) {
 					$read = fgets($handlein);
 					fwrite($handle, $read);
-					$output_arr[]=$read;
+					$output_arr[] = $read;
 				}
 				pclose($handlein);
 				fclose($handle);
@@ -915,7 +915,7 @@ 
 
 		if ($retval == 0) {
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);
-			$filename=''; $linenum=0;
+			$filename = ''; $linenum = 0;
 
 			if (php_sapi_name() != 'cli') {	// If we are in a web context (not into CLI context)
 				if (headers_sent($filename, $linenum)) {
@@ -923,7 +923,7 @@ 
 				}
 
 				if (!empty($conf->global->MAIN_DISABLE_PDF_AUTOUPDATE)) {
-					$name=preg_replace('/\.od(x|t)/i', '', $name);
+					$name = preg_replace('/\.od(x|t)/i', '', $name);
 					header('Content-type: application/pdf');
 					header('Content-Disposition: attachment; filename="'.$name.'.pdf"');
 					readfile($name.".pdf");
@@ -938,13 +938,13 @@ 
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $output_arr='.var_export($output_arr, true), LOG_DEBUG);
 
 			if ($retval == 126) {
-				throw new OdfException('Permission execute convert script : ' . $command);
+				throw new OdfException('Permission execute convert script : '.$command);
 			} else {
-				$errorstring='';
+				$errorstring = '';
 				foreach ($output_arr as $line) {
-					$errorstring.= $line."<br>";
+					$errorstring .= $line."<br>";
 				}
-				throw new OdfException('ODT to PDF convert fail (option MAIN_ODT_AS_PDF is '.$conf->global->MAIN_ODT_AS_PDF.', command was '.$command.', retval='.$retval.') : ' . $errorstring);
+				throw new OdfException('ODT to PDF convert fail (option MAIN_ODT_AS_PDF is '.$conf->global->MAIN_ODT_AS_PDF.', command was '.$command.', retval='.$retval.') : '.$errorstring);
 			}
 		}
 	}
@@ -998,11 +998,11 @@ 
 		if ($handle = opendir($dir)) {
 			while (($file = readdir($handle)) !== false) {
 				if ($file != '.' && $file != '..') {
-					if (is_dir($dir . '/' . $file)) {
-						$this->_rrmdir($dir . '/' . $file);
-						rmdir($dir . '/' . $file);
+					if (is_dir($dir.'/'.$file)) {
+						$this->_rrmdir($dir.'/'.$file);
+						rmdir($dir.'/'.$file);
 					} else {
-						unlink($dir . '/' . $file);
+						unlink($dir.'/'.$file);
 					}
 				}
 			}
@@ -1018,7 +1018,7 @@ 
 	 */
 	public function getvalue($valuename)
 	{
-		$searchreg="/\\[".$valuename."\\](.*)\\[\\/".$valuename."\\]/";
+		$searchreg = "/\\[".$valuename."\\](.*)\\[\\/".$valuename."\\]/";
 		$matches = array();
 		preg_match($searchreg, $this->contentXml, $matches);
 		$this->contentXml = preg_replace($searchreg, "", $this->contentXml);

htdocs/includes/odtphp/SegmentIterator.php

Indentation +36 added lines, -36 removed lines

@@ -10,41 +10,41 @@
  */
 class SegmentIterator implements RecursiveIterator
 {
-    private $ref;
-    private $key;
-    public function __construct(array $ref)
-    {
-        $this->ref = $ref;
-        $this->key = 0;
-        $this->keys = array_keys($this->ref);
-    }
-    public function hasChildren()
-    {
-        return $this->valid() && $this->current() instanceof Segment;
-    }
-    public function current()
-    {
-        return $this->ref[$this->keys[$this->key]];
-    }
-    function getChildren()
-    {
-        return new self($this->current()->children);
-    }
-    public function key()
-    {
-        return $this->key;
-    }
-    public function valid()
-    {
-        return array_key_exists($this->key, $this->keys);
-    }
-    public function rewind()
-    {
-        $this->key = 0;
-    }
-    public function next()
-    {
-        $this->key ++;
-    }
+	private $ref;
+	private $key;
+	public function __construct(array $ref)
+	{
+		$this->ref = $ref;
+		$this->key = 0;
+		$this->keys = array_keys($this->ref);
+	}
+	public function hasChildren()
+	{
+		return $this->valid() && $this->current() instanceof Segment;
+	}
+	public function current()
+	{
+		return $this->ref[$this->keys[$this->key]];
+	}
+	function getChildren()
+	{
+		return new self($this->current()->children);
+	}
+	public function key()
+	{
+		return $this->key;
+	}
+	public function valid()
+	{
+		return array_key_exists($this->key, $this->keys);
+	}
+	public function rewind()
+	{
+		$this->key = 0;
+	}
+	public function next()
+	{
+		$this->key ++;
+	}
 }
 

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     }
     public function next()
     {
-        $this->key ++;
+        $this->key++;
     }
 }
 

htdocs/includes/odtphp/Segment.php

Indentation +11 added lines, -11 removed lines

@@ -156,17 +156,17 @@
 	}
 
 	/**
-	* Function to replace macros for invoice short and long month, invoice year
-	*
-	* Substitution occur when the invoice is generated, not considering the invoice date
-	* so do not (re)generate in a diferent date than the one that the invoice belongs to
-	* Perhaps it would be better to use the invoice issued date but I still do not know
-	* how to get it here
-	*
-	* Miguel Erill 09/04/2017
-	*
-	* @param	string	$value	String to convert
-	*/
+	 * Function to replace macros for invoice short and long month, invoice year
+	 *
+	 * Substitution occur when the invoice is generated, not considering the invoice date
+	 * so do not (re)generate in a diferent date than the one that the invoice belongs to
+	 * Perhaps it would be better to use the invoice issued date but I still do not know
+	 * how to get it here
+	 *
+	 * Miguel Erill 09/04/2017
+	 *
+	 * @param	string	$value	String to convert
+	 */
 	public function macroReplace($text)
 	{
 		include_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';

Spacing +20 added lines, -20 removed lines

@@ -88,21 +88,21 @@ 
 	{
 		// To provide debug information on line number processed
 		global $count;
-		if (empty($count)) $count=1;
+		if (empty($count)) $count = 1;
 		else $count++;
 
-		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		if (empty($this->savxml)) $this->savxml = $this->xml; // Sav content of line at first line merged, so we will reuse original for next steps
 		$this->xml = $this->savxml;
-		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
+		$tmpvars = $this->vars; // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
 		// Search all tags fou into condition to complete $tmpvars, so we will proceed all tests even if not defined
-		$reg='@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
+		$reg = '@\[!--\sIF\s([{}a-zA-Z0-9\.\,_]+)\s--\]@smU';
 		$matches = array();
 		preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 		//var_dump($tmpvars);exit;
 		foreach ($matches as $match) {   // For each match, if there is no entry into this->vars, we add it
-			if (! empty($match[1]) && ! isset($tmpvars[$match[1]])) {
-				$tmpvars[$match[1]] = '';     // Not defined, so we set it to '', we just need entry into this->vars for next loop
+			if (!empty($match[1]) && !isset($tmpvars[$match[1]])) {
+				$tmpvars[$match[1]] = ''; // Not defined, so we set it to '', we just need entry into this->vars for next loop
 			}
 		}
 
@@ -114,13 +114,13 @@ 
 				// Remove the IF tag
 				$this->xml = str_replace('[!-- IF '.$key.' --]', '', $this->xml);
 				// Remove everything between the ELSE tag (if it exists) and the ENDIF tag
-				$reg = '@(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$reg = '@(\[!--\sELSE\s'.$key.'\s--\](.*))?\[!--\sENDIF\s'.$key.'\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				$this->xml = preg_replace($reg, '', $this->xml);
 			}
 			// Else the value is false, then two cases: no ELSE and we're done, or there is at least one place where there is an ELSE clause, then we replace it
 			else {
 				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
-				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$reg = '@\[!--\sIF\s'.$key.'\s--\](.*)(\[!--\sELSE\s'.$key.'\s--\](.*))?\[!--\sENDIF\s'.$key.'\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
 					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
@@ -133,7 +133,7 @@ 
 		$this->xmlParsed .= str_replace(array_keys($tmpvars), array_values($tmpvars), $this->xml);
 		if ($this->hasChildren()) {
 			foreach ($this->children as $child) {
-				$this->xmlParsed = str_replace($child->xml, ($child->xmlParsed=="")?$child->merge():$child->xmlParsed, $this->xmlParsed);
+				$this->xmlParsed = str_replace($child->xml, ($child->xmlParsed == "") ? $child->merge() : $child->xmlParsed, $this->xmlParsed);
 				$child->xmlParsed = '';
 			}
 		}
@@ -143,9 +143,9 @@ 
 		$this->xmlParsed = $this->macroReplace($this->xmlParsed);
 		$this->file->open($this->odf->getTmpfile());
 		foreach ($this->images as $imageKey => $imageValue) {
-			if ($this->file->getFromName('Pictures/' . $imageValue) === false) {
+			if ($this->file->getFromName('Pictures/'.$imageValue) === false) {
 				// Add the image inside the ODT document
-				$this->file->addFile($imageKey, 'Pictures/' . $imageValue);
+				$this->file->addFile($imageKey, 'Pictures/'.$imageValue);
 				// Add the image to the Manifest (which maintains a list of images, necessary to avoid "Corrupt ODT file. Repair?" when opening the file with LibreOffice)
 				$this->odf->addImageToManifest($imageValue);
 			}
@@ -176,16 +176,16 @@ 
 		$dateinonemontharray = dol_get_next_month($hoy['mon'], $hoy['year']);
 		$nextMonth = $dateinonemontharray['month'];
 
-		$patterns=array( '/__CURRENTDAY__/u','/__CURENTWEEKDAY__/u',
-						 '/__CURRENTMONTH__/u','/__CURRENTMONTHLONG__/u',
-						 '/__NEXTMONTH__/u','/__NEXTMONTHLONG__/u',
-						 '/__CURRENTYEAR__/u','/__NEXTYEAR__/u' );
-		$values=array( $hoy['mday'], $langs->transnoentitiesnoconv($hoy['wday']),
+		$patterns = array('/__CURRENTDAY__/u', '/__CURENTWEEKDAY__/u',
+						 '/__CURRENTMONTH__/u', '/__CURRENTMONTHLONG__/u',
+						 '/__NEXTMONTH__/u', '/__NEXTMONTHLONG__/u',
+						 '/__CURRENTYEAR__/u', '/__NEXTYEAR__/u');
+		$values = array($hoy['mday'], $langs->transnoentitiesnoconv($hoy['wday']),
 					   $hoy['mon'], monthArray($langs)[$hoy['mon']],
 					   $nextMonth, monthArray($langs)[$nextMonth],
-					   $hoy['year'], $hoy['year']+1 );
+					   $hoy['year'], $hoy['year'] + 1);
 
-		$text=preg_replace($patterns, $values, $text);
+		$text = preg_replace($patterns, $values, $text);
 
 		return $text;
 	}
@@ -223,7 +223,7 @@ 
 	 */
 	public function setVars($key, $value, $encode = true, $charset = 'ISO-8859')
 	{
-		$tag = $this->odf->getConfig('DELIMITER_LEFT') . $key . $this->odf->getConfig('DELIMITER_RIGHT');
+		$tag = $this->odf->getConfig('DELIMITER_LEFT').$key.$this->odf->getConfig('DELIMITER_RIGHT');
 
 		if (strpos($this->xml, $tag) === false) {
 			//throw new SegmentException("var $key not found in {$this->getName()}");
@@ -277,7 +277,7 @@ 
 		if (array_key_exists($prop, $this->children)) {
 			return $this->children[$prop];
 		} else {
-			throw new SegmentException('child ' . $prop . ' does not exist');
+			throw new SegmentException('child '.$prop.' does not exist');
 		}
 	}
 	/**

Braces +12 added lines, -4 removed lines

@@ -88,10 +88,16 @@ 
 	{
 		// To provide debug information on line number processed
 		global $count;
-		if (empty($count)) $count=1;
-		else $count++;
+		if (empty($count)) {
+			$count=1;
+		} else {
+			$count++;
+		}
 
-		if (empty($this->savxml)) $this->savxml = $this->xml;       // Sav content of line at first line merged, so we will reuse original for next steps
+		if (empty($this->savxml)) {
+			$this->savxml = $this->xml;
+		}
+		// Sav content of line at first line merged, so we will reuse original for next steps
 		$this->xml = $this->savxml;
 		$tmpvars = $this->vars;                                     // Store into $tmpvars so we won't modify this->vars when completing data with empty values
 
@@ -123,7 +129,9 @@ 
 				$reg = '@\[!--\sIF\s' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $key . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $this->xml, $matches, PREG_SET_ORDER);
 				foreach ($matches as $match) { // For each match, if there is an ELSE clause, we replace the whole block by the value in the ELSE clause
-					if (!empty($match[3])) $this->xml = str_replace($match[0], $match[3], $this->xml);
+					if (!empty($match[3])) {
+						$this->xml = str_replace($match[0], $match[3], $this->xml);
+					}
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$this->xml = preg_replace($reg, '', $this->xml);

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -260,7 +260,7 @@
 
 		$xml = <<<IMG
 <draw:frame draw:style-name="fr1" draw:name="$filename" text:anchor-type="aschar" svg:width="{$width}cm" svg:height="{$height}cm" draw:z-index="3"><draw:image xlink:href="Pictures/$file" xlink:type="simple" xlink:show="embed" xlink:actuate="onLoad"/></draw:frame>
-IMG;
+img;
 		$this->images[$value] = $file;
 		$this->setVars($key, $xml, false);
 		return $this;

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')
 ;