Dolibarr / dolibarr

htdocs/includes/odtphp/odf.php

Spacing +80 added lines, -80 removed lines

@@ -31,7 +31,7 @@ 
 class Odf
 {
 	protected $config = array(
-		'ZIP_PROXY' => 'PclZipProxy',	// PclZipProxy, PhpZipProxy
+		'ZIP_PROXY' => 'PclZipProxy', // PclZipProxy, PhpZipProxy
 		'DELIMITER_LEFT' => '{',
 		'DELIMITER_RIGHT' => '}',
 		'PATH_TO_TMP' => '/tmp'
@@ -106,7 +106,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) {
@@ -116,12 +116,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');
 		}
 
@@ -141,8 +141,8 @@ 
 		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);
@@ -192,7 +192,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>
@@ -227,7 +227,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(
@@ -245,7 +245,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
@@ -255,16 +255,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);
@@ -301,23 +301,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'])) {
@@ -332,7 +332,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)) {
@@ -340,21 +340,21 @@ 
 											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;
 								}
 							}
 							if (strlen($odtStyles) > 0) {
 								// Generate a unique id for the style (using microtime and random because some CPUs are really fast...)
-								$key = str_replace('.', '', (string) microtime(true)) . uniqid(mt_rand());
+								$key = str_replace('.', '', (string) microtime(true)).uniqid(mt_rand());
 								$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;
@@ -493,24 +493,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;
@@ -543,7 +543,7 @@ 
 	 * @throws OdfException
 	 * @return odf
 	 */
-	public function setImage($key, $value, float $ratio=1)
+	public function setImage($key, $value, float $ratio = 1)
 	{
 		$filename = strtok(strrchr($value, '/'), '/.');
 		$file = substr(strrchr($value, '/'), 1);
@@ -587,10 +587,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);
@@ -613,13 +613,13 @@ 
 		else return;
 
 		// 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, $xml, $matches, PREG_SET_ORDER);
 
 		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
 			}
 		}
 
@@ -633,7 +633,7 @@ 
 				// Remove the IF tag
 				$xml = str_replace('[!-- IF '.$key.' --]', '', $xml);
 				// Remove everything between the ELSE tag (if it exists) and the ENDIF tag
-				$reg = '@(\[!--\sELSE\s' . preg_quote($key, '@') . '\s--\](.*))?\[!--\sENDIF\s' . preg_quote($key, '@') . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$reg = '@(\[!--\sELSE\s'.preg_quote($key, '@').'\s--\](.*))?\[!--\sENDIF\s'.preg_quote($key, '@').'\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				$xml = preg_replace($reg, '', $xml);
 				/*if ($sav != $xml)
 				 {
@@ -646,7 +646,7 @@ 
 				//dol_syslog("Var ".$key." is not defined, we remove the IF, ELSE and ENDIF ");
 				//$sav=$xml;
 				// Find all conditional blocks for this variable: from IF to ELSE and to ENDIF
-				$reg = '@\[!--\sIF\s' . preg_quote($key, '@') . '\s--\](.*)(\[!--\sELSE\s' . preg_quote($key, '@') . '\s--\](.*))?\[!--\sENDIF\s' . preg_quote($key, '@') . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
+				$reg = '@\[!--\sIF\s'.preg_quote($key, '@').'\s--\](.*)(\[!--\sELSE\s'.preg_quote($key, '@').'\s--\](.*))?\[!--\sENDIF\s'.preg_quote($key, '@').'\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $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])) $xml = str_replace($match[0], $match[3], $xml);
@@ -674,12 +674,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;
 	}
@@ -691,7 +691,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);
 	}
 
 	/**
@@ -712,7 +712,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>';
 	}
 
 	/**
@@ -748,7 +748,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);
@@ -765,7 +765,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');
@@ -774,26 +774,26 @@ 
 		$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');
 		}
 
 		// NOTE: After the first addFromString() that do the first $this->pclzip->delete, when using pclzip handler, the zip/oft file is corrupted (no way to edit it with Fileroller).
 
-		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();
@@ -807,7 +807,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);
@@ -856,8 +856,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');
@@ -879,18 +879,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 = (getDolGlobalString('MAIN_EXEC_USE_POPEN') ? 2 : 1);	// 1 or 2
+		$execmethod = (getDolGlobalString('MAIN_EXEC_USE_POPEN') ? 2 : 1); // 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
 			$countdeleted = 0;
@@ -901,7 +901,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:'.(getDolGlobalString('MAIN_ODT_ADD_SLASH_FOR_WINDOWS') ? '///' : '').'\''.$conf->user->dir_temp.'/odtaspdf\' --convert-to pdf --outdir '. escapeshellarg(dirname($name)). " ".escapeshellarg($name);
+			$command = 'soffice --headless -env:UserInstallation=file:'.(getDolGlobalString('MAIN_ODT_ADD_SLASH_FOR_WINDOWS') ? '///' : '').'\''.$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
 
@@ -931,13 +931,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'));
 			}
 		}
 
@@ -950,14 +950,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);
@@ -966,7 +966,7 @@ 
 				while (!feof($handlein)) {
 					$read = fgets($handlein);
 					fwrite($handle, $read);
-					$output_arr[]=$read;
+					$output_arr[] = $read;
 				}
 				pclose($handlein);
 				fclose($handle);
@@ -976,7 +976,7 @@ 
 
 		if ($retval == 0) {
 			dol_syslog(get_class($this).'::exportAsAttachedPDF $ret_val='.$retval, LOG_DEBUG);
-			$filename=''; $linenum=0;
+			$filename = ''; $linenum = 0;
 
 			if ($dooutputfordownload) {
 				if (php_sapi_name() != 'cli') {    // If we are in a web context (not into CLI context)
@@ -987,8 +987,8 @@ 
 					if (getDolGlobalString('MAIN_DISABLE_PDF_AUTOUPDATE')) {
 						$name = preg_replace('/\.od(x|t)/i', '', $name);
 						header('Content-type: application/pdf');
-						header('Content-Disposition: attachment; filename="' . basename($name) . '.pdf"');
-						readfile($name . ".pdf");
+						header('Content-Disposition: attachment; filename="'.basename($name).'.pdf"');
+						readfile($name.".pdf");
 					}
 				}
 			}
@@ -1001,13 +1001,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);
 			}
 		}
 	}
@@ -1064,11 +1064,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);
 					}
 				}
 			}
@@ -1084,7 +1084,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);

Braces +31 added lines, -11 removed lines

@@ -116,7 +116,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.
 
@@ -138,7 +141,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'])) {
@@ -284,8 +289,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 = '';
 
@@ -607,10 +616,15 @@ 
 	 */
 	private function _parse($type = 'content')
 	{
-		if ($type == 'content') $xml = &$this->contentXml;
-		elseif ($type == 'styles') $xml = &$this->stylesXml;
-		elseif ($type == 'meta') $xml = &$this->metaXml;
-		else return;
+		if ($type == 'content') {
+			$xml = &$this->contentXml;
+		} elseif ($type == 'styles') {
+			$xml = &$this->stylesXml;
+		} elseif ($type == 'meta') {
+			$xml = &$this->metaXml;
+		} else {
+			return;
+		}
 
 		// 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';
@@ -649,7 +663,9 @@ 
 				$reg = '@\[!--\sIF\s' . preg_quote($key, '@') . '\s--\](.*)(\[!--\sELSE\s' . preg_quote($key, '@') . '\s--\](.*))?\[!--\sENDIF\s' . preg_quote($key, '@') . '\s--\]@smU'; // U modifier = all quantifiers are non-greedy
 				preg_match_all($reg, $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])) $xml = str_replace($match[0], $match[3], $xml);
+					if (!empty($match[3])) {
+						$xml = str_replace($match[0], $match[3], $xml);
+					}
 				}
 				// Cleanup the other conditional blocks (all the others where there were no ELSE clause, we can just remove them altogether)
 				$xml = preg_replace($reg, '', $xml);
@@ -807,7 +823,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);
@@ -879,7 +897,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);

htdocs/includes/odtphp/zip/PhpZipProxy.php

Indentation +5 added lines, -5 removed lines

@@ -17,11 +17,11 @@
 {
 	protected $zipArchive;
 	protected $filename;
-    /**
-     * Class constructor
-     *
-     * @throws PhpZipProxyException
-     */
+	/**
+	 * Class constructor
+	 *
+	 * @throws PhpZipProxyException
+	 */
 	public function __construct()
 	{
 		if (! class_exists('ZipArchive')) {

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
      */
 	public function __construct()
 	{
-		if (! class_exists('ZipArchive')) {
+		if (!class_exists('ZipArchive')) {
 			throw new PhpZipProxyException('Zip extension not loaded - check your php settings, PHP5.2 minimum with zip extension
 			 is required for using PhpZipProxy'); ;
 		}

htdocs/includes/odtphp/zip/PclZipProxy.php

Spacing +8 added lines, -8 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('ODTPHP_PATHTOPCLZIP')) {
+if (!defined('ODTPHP_PATHTOPCLZIP')) {
 	define('ODTPHP_PATHTOPCLZIP', DOL_DOCUMENT_ROOT.'/includes/odtphp/zip/pclzip/');
 }
 require_once ODTPHP_PATHTOPCLZIP.'pclzip.lib.php';
@@ -28,13 +28,13 @@ 
      *
      * @throws PclZipProxyException
      */
-	public function __construct($forcedir='')
+	public function __construct($forcedir = '')
 	{
-		if (! class_exists('PclZip')) {
+		if (!class_exists('PclZip')) {
 			throw new PclZipProxyException('PclZip class not loaded - PclZip library
 			 is required for using PclZipProxy'); ;
 		}
-		if ($forcedir) $this->tmpdir=preg_replace('|[//\/]$|','',$forcedir);	// $this->tmpdir must not contains / at the end
+		if ($forcedir) $this->tmpdir = preg_replace('|[//\/]$|', '', $forcedir); // $this->tmpdir must not contains / at the end
 	}
 
 	/**
@@ -92,11 +92,11 @@ 
 
 		$localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname);
 		$localpath = dirname($localname);
-		$tmpfilename = $this->tmpdir . '/' . basename($localname);
+		$tmpfilename = $this->tmpdir.'/'.basename($localname);
 		if (false !== file_put_contents($tmpfilename, $contents)) {
 			//print "tmpfilename=".$tmpfilename;
 			//print "localname=".$localname;
-			$res = $this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname);		// after this with pclzip handler, the odt/zip file is ocrrupted. No way to edit the zip with file roller.
+			$res = $this->pclzip->delete(PCLZIP_OPT_BY_NAME, $localname); // after this with pclzip handler, the odt/zip file is ocrrupted. No way to edit the zip with file roller.
 			$add = $this->pclzip->add($tmpfilename,
 				PCLZIP_OPT_REMOVE_PATH, $this->tmpdir,
 				PCLZIP_OPT_ADD_PATH, $localpath);
@@ -127,10 +127,10 @@ 
 		if (isSet($localname)) {
 			$localname = preg_replace("/(?:\.|\/)*(.*)/", "\\1", $localname);
 			$localpath = dirname($localname);
-			$tmpfilename = $this->tmpdir . '/' . basename($localname);
+			$tmpfilename = $this->tmpdir.'/'.basename($localname);
 		} else {
 			$localname = basename($filename);
-			$tmpfilename = $this->tmpdir . '/' . $localname;
+			$tmpfilename = $this->tmpdir.'/'.$localname;
 			$localpath = '';
 		}
 		if (file_exists($filename)) {

htdocs/admin/tools/export.php

Spacing +1 added lines, -1 removed lines

@@ -135,7 +135,7 @@
 		if (!dol_is_file($cmddump)) {									// And if file not reachable with its full path
 			$reg = array();
 			if (preg_match('/mysqldump(\.exe)?$/', $cmddump, $reg)) {	// And if command ends with mysqldump
-				$cmddump = 'mysqldump'.(empty($reg[1]) ? '' : $reg[1]);	// Then we try the command with no forced path
+				$cmddump = 'mysqldump'.(empty($reg[1]) ? '' : $reg[1]); // Then we try the command with no forced path
 			}
 		}
 	}