Dolibarr / dolibarr

htdocs/includes/odtphp/odf.php

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/core/class/CMailFile.class.php

Spacing +15 added lines, -15 removed lines

@@ -264,7 +264,7 @@ 
 				// This convert an embedd file with src="/viewimage.php?modulepart... into a cid link
 				// TODO Exclude viewimage used for the read tracker ?
 				$findimg = $this->findHtmlImages($dolibarr_main_data_root.'/medias');
-				if ($findimg<0) {
+				if ($findimg < 0) {
 					dol_syslog("CMailFile::CMailfile: Error on findHtmlImages");
 					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
 					return;
@@ -275,7 +275,7 @@ 
 				// Search into the body for <img src="data:image/ext;base64,..." to replace them with an embedded file
 				// This convert an embedded file with src="data:image... into a cid link + attached file
 				$resultImageData = $this->findHtmlImagesIsSrcData($upload_dir_tmp);
-				if ($resultImageData<0) {
+				if ($resultImageData < 0) {
 					dol_syslog("CMailFile::CMailfile: Error on findHtmlImagesInSrcData");
 					$this->error = 'ErrorInAddAttachementsImageBaseOnMedia';
 					return;
@@ -333,7 +333,7 @@ 
 					}
 				}
 				if ($emailtoadd && preg_match('/'.preg_quote($emailtoadd, '/').'/i', $to)) {
-					$emailtoadd = '';	// Email already in the "To"
+					$emailtoadd = ''; // Email already in the "To"
 				}
 				if ($emailtoadd) {
 					$listofemailstoadd[$key] = $emailtoadd;
@@ -996,19 +996,19 @@ 
 				$res = true;
 				$from = $this->smtps->getFrom('org');
 				if ($res && !$from) {
-					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport)." - Sender address '$from' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".getDolGlobalString($keyforsmtpport)." - Sender address '$from' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
 				$dest = $this->smtps->getTo();
 				if ($res && !$dest) {
-					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport)." - Recipient address '$dest' invalid";
+					$this->error = "Failed to send mail with smtps lib to HOST=".$server.", PORT=".getDolGlobalString($keyforsmtpport)." - Recipient address '$dest' invalid";
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
 				}
 
 				if ($res) {
-					dol_syslog("CMailFile::sendfile: sendMsg, HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport), LOG_DEBUG);
+					dol_syslog("CMailFile::sendfile: sendMsg, HOST=".$server.", PORT=".getDolGlobalString($keyforsmtpport), LOG_DEBUG);
 
 					if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
 						$this->smtps->setDebug(true);
@@ -1021,8 +1021,8 @@ 
 					}
 
 					$smtperrorcode = 0;
-					if (! $result) {
-						$smtperrorcode = $this->smtps->lastretval;	// SMTP error code
+					if (!$result) {
+						$smtperrorcode = $this->smtps->lastretval; // SMTP error code
 						dol_syslog("CMailFile::sendfile: mail SMTP error code ".$smtperrorcode, LOG_WARNING);
 
 						if ($smtperrorcode == '421') {	// Try later
@@ -1040,7 +1040,7 @@ 
 						}
 					}
 
-					$result = $this->smtps->getErrors();	// applicative error code (not SMTP error code)
+					$result = $this->smtps->getErrors(); // applicative error code (not SMTP error code)
 					if (empty($this->error) && empty($result)) {
 						dol_syslog("CMailFile::sendfile: mail end success", LOG_DEBUG);
 						$res = true;
@@ -1048,7 +1048,7 @@ 
 						if (empty($this->error)) {
 							$this->error = $result;
 						}
-						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport)." - ".$this->error, LOG_ERR);
+						dol_syslog("CMailFile::sendfile: mail end error with smtps lib to HOST=".$server.", PORT=".getDolGlobalString($keyforsmtpport)." - ".$this->error, LOG_ERR);
 						$res = false;
 
 						if (getDolGlobalString('MAIN_MAIL_DEBUG')) {
@@ -1177,7 +1177,7 @@ 
 					$this->mailer->registerPlugin(new Swift_Plugins_LoggerPlugin($this->logger));
 				}
 
-				dol_syslog("CMailFile::sendfile: mailer->send, HOST=".$server.", PORT=" . getDolGlobalString($keyforsmtpport), LOG_DEBUG);
+				dol_syslog("CMailFile::sendfile: mailer->send, HOST=".$server.", PORT=".getDolGlobalString($keyforsmtpport), LOG_DEBUG);
 
 				// send mail
 				$failedRecipients = array();
@@ -1193,7 +1193,7 @@ 
 				$res = true;
 				if (!empty($this->error) || !empty($this->errors) || !$result) {
 					if (!empty($failedRecipients)) {
-						$this->errors[] = 'Transport failed for the following addresses: "' . join('", "', $failedRecipients) . '".';
+						$this->errors[] = 'Transport failed for the following addresses: "'.join('", "', $failedRecipients).'".';
 					}
 					dol_syslog("CMailFile::sendfile: mail end error=".$this->error, LOG_ERR);
 					$res = false;
@@ -1287,7 +1287,7 @@ 
 
 		if (@is_writeable($dolibarr_main_data_root)) {	// Avoid fatal error on fopen with open_basedir
 			$outputfile = $dolibarr_main_data_root."/dolibarr_mail.log";
-			$fp = fopen($outputfile, "w");	// overwrite
+			$fp = fopen($outputfile, "w"); // overwrite
 
 			if ($this->sendmode == 'mail') {
 				fputs($fp, $this->headers);
@@ -1546,7 +1546,7 @@ 
 			// Similar code to forge a text from html is also in smtps.class.php
 			$strContentAltText = preg_replace("/<br\s*[^>]*>/", " ", $strContent);
 			// TODO We could replace <img ...> with [Filename.ext] like Gmail do.
-			$strContentAltText = html_entity_decode(strip_tags($strContentAltText));	// Remove any HTML tags
+			$strContentAltText = html_entity_decode(strip_tags($strContentAltText)); // Remove any HTML tags
 			$strContentAltText = trim(wordwrap($strContentAltText, 75, !getDolGlobalString('MAIN_FIX_FOR_BUGGED_MTA') ? "\r\n" : "\n"));
 
 			// Check if html header already in message, if not complete the message
@@ -1929,7 +1929,7 @@ 
 				// We save the image to send in disk
 				$filecontent = $matches[2][$key];
 
-				$cid = 'cid000'.dol_hash($filecontent, 'md5');		// The id must not change if image is same
+				$cid = 'cid000'.dol_hash($filecontent, 'md5'); // The id must not change if image is same
 
 				$destfiletmp = $images_dir.'/'.$cid.'.'.$ext;
 

htdocs/commande/list.php

Spacing +10 added lines, -10 removed lines

@@ -179,7 +179,7 @@ 
 	'typent.code'=>array('label'=>"ThirdPartyType", 'checked'=>$checkedtypetiers, 'position'=>55),
 	'c.date_commande'=>array('label'=>"OrderDateShort", 'checked'=>1, 'position'=>60, 'csslist'=>'nowraponall'),
 	'c.date_delivery'=>array('label'=>"DateDeliveryPlanned", 'checked'=>1, 'enabled'=>!getDolGlobalString('ORDER_DISABLE_DELIVERY_DATE'), 'position'=>65, 'csslist'=>'nowraponall'),
-	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66 , 'enabled'=>isModEnabled("expedition")),
+	'c.fk_shipping_method'=>array('label'=>"SendingMethod", 'checked'=>-1, 'position'=>66, 'enabled'=>isModEnabled("expedition")),
 	'c.fk_cond_reglement'=>array('label'=>"PaymentConditionsShort", 'checked'=>-1, 'position'=>67),
 	'c.fk_mode_reglement'=>array('label'=>"PaymentMode", 'checked'=>-1, 'position'=>68),
 	'c.fk_input_reason'=>array('label'=>"Channel", 'checked'=>-1, 'position'=>69),
@@ -202,7 +202,7 @@ 
 	'c.date_cloture'=>array('label'=>"DateClosing", 'checked'=>0, 'position'=>130),
 	'c.note_public'=>array('label'=>'NotePublic', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PUBLIC_NOTES')), 'position'=>135),
 	'c.note_private'=>array('label'=>'NotePrivate', 'checked'=>0, 'enabled'=>(!getDolGlobalInt('MAIN_LIST_HIDE_PRIVATE_NOTES')), 'position'=>140),
-	'shippable'=>array('label'=>"Shippable", 'checked'=>1,'enabled'=>(isModEnabled("expedition")), 'position'=>990),
+	'shippable'=>array('label'=>"Shippable", 'checked'=>1, 'enabled'=>(isModEnabled("expedition")), 'position'=>990),
 	'c.facture'=>array('label'=>"Billed", 'checked'=>1, 'enabled'=>(!getDolGlobalString('WORKFLOW_BILL_ON_SHIPMENT')), 'position'=>995),
 	'c.import_key' =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'position'=>999),
 	'c.fk_statut'=>array('label'=>"Status", 'checked'=>1, 'position'=>1000)
@@ -319,8 +319,8 @@ 
 	}
 	$uploaddir = $conf->commande->multidir_output[$conf->entity];
 	$triggersendname = 'ORDER_SENTBYMAIL';
-	$year="";
-	$month="";
+	$year = "";
+	$month = "";
 	include DOL_DOCUMENT_ROOT.'/core/actions_massactions.inc.php';
 
 	if ($massaction == 'confirm_createbills') {   // Create bills from orders.
@@ -335,7 +335,7 @@ 
 		$TFactThirdNbLines = array();
 
 		$nb_bills_created = 0;
-		$lastid= 0;
+		$lastid = 0;
 		$lastref = '';
 
 		$db->begin();
@@ -1020,7 +1020,7 @@ 
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
 			}
 		}
 	}
@@ -1050,7 +1050,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."commandedet as cd WHERE cd.fk_commande = c.rowid AND cd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -2616,13 +2616,13 @@ 
 			print '<td class="center">';
 			if (!empty($show_shippable_command) && isModEnabled('stock')) {
 				if (($obj->fk_statut > $generic_commande::STATUS_DRAFT) && ($obj->fk_statut < $generic_commande::STATUS_CLOSED)) {
-					$generic_commande->getLinesArray(); 	// Load array ->lines
-					$generic_commande->loadExpeditions();	// Load array ->expeditions
+					$generic_commande->getLinesArray(); // Load array ->lines
+					$generic_commande->loadExpeditions(); // Load array ->expeditions
 
 					$numlines = count($generic_commande->lines); // Loop on each line of order
 					for ($lig = 0; $lig < $numlines; $lig++) {
 						if (isset($generic_commande->expeditions[$generic_commande->lines[$lig]->id])) {
-							$reliquat =  $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
+							$reliquat = $generic_commande->lines[$lig]->qty - $generic_commande->expeditions[$generic_commande->lines[$lig]->id];
 						} else {
 							$reliquat = $generic_commande->lines[$lig]->qty;
 						}

htdocs/comm/propal/list.php

Spacing +14 added lines, -14 removed lines

@@ -65,20 +65,20 @@ 
 // Get Parameters
 $socid = GETPOST('socid', 'int');
 
-$action 	= GETPOST('action', 'aZ09');
+$action = GETPOST('action', 'aZ09');
 $massaction = GETPOST('massaction', 'alpha');
 $show_files = GETPOST('show_files', 'int');
-$confirm 	= GETPOST('confirm', 'alpha');
+$confirm = GETPOST('confirm', 'alpha');
 $cancel     = GETPOST('cancel', 'alpha');
-$toselect 	= GETPOST('toselect', 'array');
+$toselect = GETPOST('toselect', 'array');
 $contextpage = GETPOST('contextpage', 'aZ') ? GETPOST('contextpage', 'aZ') : 'proposallist';
-$mode 		= GETPOST('mode', 'alpha');
+$mode = GETPOST('mode', 'alpha');
 
 // Search Fields
 $search_all = trim((GETPOST('search_all', 'alphanohtml') != '') ? GETPOST('search_all', 'alphanohtml') : GETPOST('sall', 'alphanohtml'));
 $search_user 	= GETPOST('search_user', 'int');
 $search_sale 	= GETPOST('search_sale', 'int');
-$search_ref 	= GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
+$search_ref = GETPOST('sf_ref') ? GETPOST('sf_ref', 'alpha') : GETPOST('search_ref', 'alpha');
 $search_refcustomer = GETPOST('search_refcustomer', 'alpha');
 $search_refproject = GETPOST('search_refproject', 'alpha');
 $search_project = GETPOST('search_project', 'alpha');
@@ -106,7 +106,7 @@ 
 $search_date_endday = GETPOST('search_date_endday', 'int');
 $search_date_endmonth = GETPOST('search_date_endmonth', 'int');
 $search_date_endyear = GETPOST('search_date_endyear', 'int');
-$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear);	// Use tzserver
+$search_date_start = dol_mktime(0, 0, 0, $search_date_startmonth, $search_date_startday, $search_date_startyear); // Use tzserver
 $search_date_end = dol_mktime(23, 59, 59, $search_date_endmonth, $search_date_endday, $search_date_endyear);
 $search_date_end_startday = GETPOST('search_date_end_startday', 'int');
 $search_date_end_startmonth = GETPOST('search_date_end_startmonth', 'int');
@@ -114,7 +114,7 @@ 
 $search_date_end_endday = GETPOST('search_date_end_endday', 'int');
 $search_date_end_endmonth = GETPOST('search_date_end_endmonth', 'int');
 $search_date_end_endyear = GETPOST('search_date_end_endyear', 'int');
-$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear);	// Use tzserver
+$search_date_end_start = dol_mktime(0, 0, 0, $search_date_end_startmonth, $search_date_end_startday, $search_date_end_startyear); // Use tzserver
 $search_date_end_end = dol_mktime(23, 59, 59, $search_date_end_endmonth, $search_date_end_endday, $search_date_end_endyear);
 $search_date_delivery_startday = GETPOST('search_date_delivery_startday', 'int');
 $search_date_delivery_startmonth = GETPOST('search_date_delivery_startmonth', 'int');
@@ -753,7 +753,7 @@ 
 			if ($searchCategoryCustomerOperator == 0) {
 				$searchCategoryCustomerSqlList[] = " EXISTS (SELECT cs.fk_soc FROM ".MAIN_DB_PREFIX."categorie_societe as cs WHERE s.rowid = cs.fk_soc AND cs.fk_categorie = ".((int) $searchCategoryCustomer).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryCustomer);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryCustomer);
 			}
 		}
 	}
@@ -783,7 +783,7 @@ 
 			if ($searchCategoryProductOperator == 0) {
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck, ".MAIN_DB_PREFIX."propaldet as pd WHERE pd.fk_propal = p.rowid AND pd.fk_product = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
 			} else {
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
 			}
 		}
 	}
@@ -1067,15 +1067,15 @@ 
 		'builddoc'=>img_picto('', 'pdf', 'class="pictofixedwidth"').$langs->trans("PDFMerge"),
 	);
 	if ($permissiontosendbymail) {
-		$arrayofmassactions['presend']=img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
+		$arrayofmassactions['presend'] = img_picto('', 'email', 'class="pictofixedwidth"').$langs->trans("SendByMail");
 	}
 	if ($permissiontovalidate) {
-		$arrayofmassactions['prevalidate']=img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
+		$arrayofmassactions['prevalidate'] = img_picto('', 'check', 'class="pictofixedwidth"').$langs->trans("Validate");
 	}
 	if ($permissiontoclose) {
-		$arrayofmassactions['presign']=img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("Sign");
-		$arrayofmassactions['nopresign']=img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("NoSign");
-		$arrayofmassactions['setbilled'] =img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
+		$arrayofmassactions['presign'] = img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("Sign");
+		$arrayofmassactions['nopresign'] = img_picto('', 'propal', 'class="pictofixedwidth"').$langs->trans("NoSign");
+		$arrayofmassactions['setbilled'] = img_picto('', 'bill', 'class="pictofixedwidth"').$langs->trans("ClassifyBilled");
 	}
 	if ($permissiontodelete) {
 		$arrayofmassactions['predelete'] = img_picto('', 'delete', 'class="pictofixedwidth"').$langs->trans("Delete");

htdocs/don/list.php

Spacing +3 added lines, -3 removed lines

@@ -136,8 +136,8 @@ 
 
 $sql .= " FROM ".MAIN_DB_PREFIX."don as d LEFT JOIN ".MAIN_DB_PREFIX."projet AS p";
 $sql .= " ON p.rowid = d.fk_projet";
-$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "societe AS s ON s.rowid = d.fk_soc";
-$sql .= " WHERE d.entity IN (". getEntity('donation') . ")";
+$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."societe AS s ON s.rowid = d.fk_soc";
+$sql .= " WHERE d.entity IN (".getEntity('donation').")";
 
 if ($search_status != '' && $search_status != '-4') {
 	$sql .= " AND d.fk_statut IN (".$db->sanitize($search_status).")";
@@ -208,7 +208,7 @@ 
 // Output page
 // --------------------------------------------------------------------
 
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
 
 // Example : Adding jquery code
 // print '<script type="text/javascript">

dev/translation/autotranslator.class.php

Spacing +47 added lines, -47 removed lines

@@ -83,46 +83,46 @@ 
 			$counter++;
 			$fileContent = null;
 			$refPath = $this->_langDir.$this->_refLang.self::DIR_SEPARATOR.$file;
-			$fileContent = file($refPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-			print "Processing file " . $file . ", with ".count($fileContent)." lines<br>\n";
+			$fileContent = file($refPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+			print "Processing file ".$file.", with ".count($fileContent)." lines<br>\n";
 
 			// Define target dirs
-			$targetlangs=array($this->_destlang);
+			$targetlangs = array($this->_destlang);
 			if ($this->_destlang == 'all') {
-				$targetlangs=array();
+				$targetlangs = array();
 
 				// If we must process all languages
-				$arraytmp=dol_dir_list($this->_langDir, 'directories', 0);
+				$arraytmp = dol_dir_list($this->_langDir, 'directories', 0);
 				foreach ($arraytmp as $dirtmp) {
 					if ($dirtmp['name'] === $this->_refLang) {
-						continue;	// We discard source language
+						continue; // We discard source language
 					}
-					$tmppart=explode('_', $dirtmp['name']);
+					$tmppart = explode('_', $dirtmp['name']);
 					if (preg_match('/^en/i', $dirtmp['name'])) {
-						continue;	// We discard en_* languages
+						continue; // We discard en_* languages
 					}
 					if (preg_match('/^fr/i', $dirtmp['name'])) {
-						continue;	// We discard fr_* languages
+						continue; // We discard fr_* languages
 					}
 					if (preg_match('/^es/i', $dirtmp['name'])) {
-						continue;	// We discard es_* languages
+						continue; // We discard es_* languages
 					}
 					if (preg_match('/ca_ES/i', $dirtmp['name'])) {
-						continue;	// We discard es_CA language
+						continue; // We discard es_CA language
 					}
 					if (preg_match('/pt_BR/i', $dirtmp['name'])) {
-						continue;	// We discard pt_BR language
+						continue; // We discard pt_BR language
 					}
 					if (preg_match('/nl_BE/i', $dirtmp['name'])) {
-						continue;  // We discard nl_BE language
+						continue; // We discard nl_BE language
 					}
 					if (preg_match('/^\./i', $dirtmp['name'])) {
-						continue;	// We discard files .*
+						continue; // We discard files .*
 					}
 					if (preg_match('/^CVS/i', $dirtmp['name'])) {
-						continue;	// We discard CVS
+						continue; // We discard CVS
 					}
-					$targetlangs[]=$dirtmp['name'];
+					$targetlangs[] = $dirtmp['name'];
 				}
 				//var_dump($targetlangs);
 			}
@@ -133,27 +133,27 @@ 
 
 				$destPath = $this->_langDir.$my_destlang.self::DIR_SEPARATOR.$file;
 				// Check destination file presence
-				if (! file_exists($destPath)) {
+				if (!file_exists($destPath)) {
 					// No file present, we generate file
-					echo "File not found: " . $destPath . ". We generate it.<br>\n";
+					echo "File not found: ".$destPath.". We generate it.<br>\n";
 					$this->createTranslationFile($destPath, $my_destlang);
 				} else {
-					echo "Updating file: " . $destPath . "<br>\n";
+					echo "Updating file: ".$destPath."<br>\n";
 				}
 
 				// Translate lines
-				$fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
-				$newlines=0;
+				$fileContentDest = file($destPath, FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
+				$newlines = 0;
 				foreach ($fileContent as $line) {
 					$key = $this->getLineKey($line);
 					$value = $this->getLineValue($line);
 					if ($key && $value) {
-						$newlines+=$this->translateFileLine($fileContentDest, $file, $key, $value, $my_destlang);
+						$newlines += $this->translateFileLine($fileContentDest, $file, $key, $value, $my_destlang);
 					}
 				}
 
 				$this->updateTranslationFile($destPath, $file, $my_destlang);
-				echo "New translated lines: " . $newlines . "<br>\n";
+				echo "New translated lines: ".$newlines."<br>\n";
 				//if ($counter ==3) die('fim');
 			}
 		}
@@ -171,14 +171,14 @@ 
 	{
 		$this->_time_end = date('Y-m-d H:i:s');
 
-		if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file])>0) {
+		if (isset($this->_translatedFiles[$file]) && count($this->_translatedFiles[$file]) > 0) {
 			$fp = fopen($destPath, 'a');
 			fwrite($fp, "\n");
 			fwrite($fp, "\n");
 			fwrite($fp, "// START - Lines generated via autotranslator.php tool (".$this->_time.").\n");
 			fwrite($fp, "// Reference language: ".$this->_refLang." -> ".$my_destlang."\n");
 			foreach ($this->_translatedFiles[$file] as $line) {
-				fwrite($fp, $line . "\n");
+				fwrite($fp, $line."\n");
 			}
 			fwrite($fp, "// STOP - Lines generated via autotranslator.php tool (".$this->_time_end.").\n");
 			fclose($fp);
@@ -199,7 +199,7 @@ 
 		fwrite($fp, "/*\n");
 		fwrite($fp, " * Language code: {$my_destlang}\n");
 		fwrite($fp, " * Automatic generated via autotranslator.php tool\n");
-		fwrite($fp, " * Generation date " . $this->_time. "\n");
+		fwrite($fp, " * Generation date ".$this->_time."\n");
 		fwrite($fp, " */\n");
 		fclose($fp);
 		return;
@@ -230,27 +230,27 @@ 
 		}
 
 		if ($key == 'CHARSET') {
-			$val=$this->_outputpagecode;
+			$val = $this->_outputpagecode;
 		} elseif (preg_match('/^Format/', $key)) {
-			$val=$value;
-		} elseif ($value=='-') {
-			$val=$value;
+			$val = $value;
+		} elseif ($value == '-') {
+			$val = $value;
 		} else {
 			// If not translated then translate
 			if ($this->_outputpagecode == 'UTF-8') {
-				$val=$this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2));
+				$val = $this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2));
 			} else {
-				$val=mb_convert_encoding($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)), 'ISO-8859-1');
+				$val = mb_convert_encoding($this->translateTexts(array($value), substr($this->_refLang, 0, 2), substr($my_destlang, 0, 2)), 'ISO-8859-1');
 			}
 		}
 
-		$val=trim($val);
+		$val = trim($val);
 
 		if (empty($val)) {
 			return 0;
 		}
 
-		$this->_translatedFiles[$file][] = $key . '=' . $val ;
+		$this->_translatedFiles[$file][] = $key.'='.$val;
 		return 1;
 	}
 
@@ -288,8 +288,8 @@ 
 	{
 		$dir = new DirectoryIterator($this->_langDir.$lang);
 		while ($dir->valid()) {
-			if (!$dir->isDot() && $dir->isFile() && ! preg_match('/^\./', $dir->getFilename())) {
-				$files[] =  $dir->getFilename();
+			if (!$dir->isDot() && $dir->isFile() && !preg_match('/^\./', $dir->getFilename())) {
+				$files[] = $dir->getFilename();
 			}
 			$dir->next();
 		}
@@ -307,20 +307,20 @@ 
 	private function translateTexts($src_texts, $src_lang, $dest_lang)
 	{
 		// We want to be sure that src_lang and dest_lang are using 2 chars only
-		$tmp=explode('_', $src_lang);
+		$tmp = explode('_', $src_lang);
 		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) {
-			$src_lang=$tmp[0];
+			$src_lang = $tmp[0];
 		}
-		$tmp=explode('_', $dest_lang);
+		$tmp = explode('_', $dest_lang);
 		if (!empty($tmp[1]) && $tmp[0] == $tmp[1]) {
-			$dest_lang=$tmp[0];
+			$dest_lang = $tmp[0];
 		}
 
 		//setting language pair
 		$lang_pair = $src_lang.'|'.$dest_lang;
 
-		$src_text_to_translate=preg_replace('/%s/', 'SSSSS', implode('', $src_texts));
-		$src_text_to_translate=preg_replace('/'.preg_quote('\n\n').'/', ' NNNNN ', $src_text_to_translate);
+		$src_text_to_translate = preg_replace('/%s/', 'SSSSS', implode('', $src_texts));
+		$src_text_to_translate = preg_replace('/'.preg_quote('\n\n').'/', ' NNNNN ', $src_text_to_translate);
 
 		// Define GET URL v1
 		//$url = "http://ajax.googleapis.com/ajax/services/language/translate?v=1.0&q=".urlencode($src_text_to_translate)."&langpair=".urlencode($lang_pair);
@@ -332,7 +332,7 @@ 
 		// Send request
 		//print "Url to translate: ".$url."\n";
 
-		if (! function_exists("curl_init")) {
+		if (!function_exists("curl_init")) {
 			print "Error, your PHP does not support curl functions.\n";
 			die();
 		}
@@ -354,10 +354,10 @@ 
 			return false;
 		}
 
-		$rep=$json['data']['translations'][0]['translatedText'];
-		$rep=preg_replace('/SSSSS/i', '%s', $rep);
-		$rep=preg_replace('/NNNNN/i', '\n\n', $rep);
-		$rep=preg_replace('/&#39;/i', '\'', $rep);
+		$rep = $json['data']['translations'][0]['translatedText'];
+		$rep = preg_replace('/SSSSS/i', '%s', $rep);
+		$rep = preg_replace('/NNNNN/i', '\n\n', $rep);
+		$rep = preg_replace('/&#39;/i', '\'', $rep);
 
 		//print "OK ".join('',$src_texts).' => '.$rep."\n";
 

test/phpunit/CMailFileTest.php

Spacing +29 added lines, -29 removed lines

@@ -27,9 +27,9 @@ 
 global $conf, $user, $langs, $db;
 //define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
 //require_once 'PHPUnit/Autoload.php';
-require_once dirname(__FILE__) . '/../../htdocs/master.inc.php';
-require_once dirname(__FILE__) . '/../../htdocs/core/class/CMailFile.class.php';
-require_once dirname(__FILE__) . '/../../htdocs/core/lib/files.lib.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/core/class/CMailFile.class.php';
+require_once dirname(__FILE__).'/../../htdocs/core/lib/files.lib.php';
 
 if (empty($user->id)) {
 	print "Load permissions for admin user nb 1\n";
@@ -71,7 +71,7 @@ 
 		$this->savlangs = $langs;
 		$this->savdb = $db;
 
-		print __METHOD__ . " db->type=" . $db->type . " user->id=" . $user->id;
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
 		//print " - db ".$db->db;
 		print "\n";
 	}
@@ -86,7 +86,7 @@ 
 		global $conf, $user, $langs, $db;
 		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
 
-		print __METHOD__ . "\n";
+		print __METHOD__."\n";
 	}
 
 	/**
@@ -99,7 +99,7 @@ 
 		global $conf, $user, $langs, $db;
 		$db->rollback();
 
-		print __METHOD__ . "\n";
+		print __METHOD__."\n";
 	}
 
 	/**
@@ -115,9 +115,9 @@ 
 		$langs = $this->savlangs;
 		$db = $this->savdb;
 
-		$conf->global->MAIN_DISABLE_ALL_MAILS = 1;    // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
+		$conf->global->MAIN_DISABLE_ALL_MAILS = 1; // If I comment/remove this lien, unit test still works alone but failed when ran from AllTest. Don't know why.
 
-		print __METHOD__ . "\n";
+		print __METHOD__."\n";
 	}
 
 	/**
@@ -127,7 +127,7 @@ 
 	 */
 	protected function tearDown(): void
 	{
-		print __METHOD__ . "\n";
+		print __METHOD__."\n";
 	}
 
 	/**
@@ -146,8 +146,8 @@ 
 		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', 'Message txt', array(), array(), array(), '', '', 1, 0);
 
 		$result = $localobject->sendfile();
-		print __METHOD__ . " result=" . $result . "\n";
-		$this->assertFalse($result);   // False because mail send disabled
+		print __METHOD__." result=".$result."\n";
+		$this->assertFalse($result); // False because mail send disabled
 
 		return $result;
 	}
@@ -169,42 +169,42 @@ 
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 0);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 1);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '<john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 2);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'john@doe.com');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 3, 0);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"John Doe" <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 3, 1);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, '"=?UTF-8?B?Sm9obiBEb2U=?=" <john@doe.com>');
 
 		$src = 'John Doe <john@doe.com>';
 		$result = $localobject->getValidAddress($src, 4);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe');
 
 		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
 		$result = $localobject->getValidAddress($src, 4);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe,John Doe2,John Doe3');
 
 		$src = 'John Doe <john@doe.com>, John Doe2 <john@doe3.com>, John Doe3 <john@doe2.com>';
 		$result = $localobject->getValidAddress($src, 4, 0, 2);
-		print __METHOD__ . " result=" . $result . "\n";
+		print __METHOD__." result=".$result."\n";
 		$this->assertEquals($result, 'John Doe,John Doe2...');
 
 		return $result;
@@ -226,9 +226,9 @@ 
 		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_IN_MEDIAS = 1;
 		$conf->global->MAIN_MAIL_ADD_INLINE_IMAGES_IF_DATA = 1;
 
-		dol_delete_dir_recursive(DOL_DATA_ROOT . '/medias/image');
-		dol_mkdir(DOL_DATA_ROOT . '/medias/image');
-		dol_copy(dirname(__FILE__) . '/img250x20.png', DOL_DATA_ROOT . '/medias/image/img250x20.png');
+		dol_delete_dir_recursive(DOL_DATA_ROOT.'/medias/image');
+		dol_mkdir(DOL_DATA_ROOT.'/medias/image');
+		dol_copy(dirname(__FILE__).'/img250x20.png', DOL_DATA_ROOT.'/medias/image/img250x20.png');
 
 		$msg = '<html><body>';
 		$msg .= '<img alt="" src="/viewimage.php?modulepart=medias&amp;entity=1&amp;file=image/img250x20.png" style="height:39px; width:150px" />';
@@ -239,31 +239,31 @@ 
 		$localobject = new CMailFile('Test', 'test@test.com', 'from@from.com', $msg, array(), array(), array(), '', '', 0, -1, '', '', '', '', 'standard', '', '/tmp');
 
 		$result = count($localobject->html_images);
-		print __METHOD__ . " result count image detected in the mail=" . $result . "\n";
+		print __METHOD__." result count image detected in the mail=".$result."\n";
 		$this->assertEquals($result, 2);
 
 
 		foreach ($localobject->html_images as $i => $val)
 		if ($localobject->html_images[$i]) {
 			if (preg_match('/img250x20\.png/i', $localobject->html_images[$i]['fullpath'])) {
-				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				print __METHOD__." content type must be image png =".$localobject->html_images[$i]['content_type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
-				print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";
+				print __METHOD__." type must be cidfromurl =".$localobject->html_images[$i]['type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromurl');
 
 				$fileSize = 9744;
-				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				print __METHOD__." File size must be =".$fileSize."\n";
 				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
 			} elseif (preg_match('/\.png/i', $localobject->html_images[$i]['fullpath'])) {
-				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+				print __METHOD__." content type must be image png =".$localobject->html_images[$i]['content_type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
-				print __METHOD__ . " type must be cidfromdata =" . $localobject->html_images[$i]['type'] . "\n";
+				print __METHOD__." type must be cidfromdata =".$localobject->html_images[$i]['type']."\n";
 				$this->assertEquals($localobject->html_images[$i]['type'], 'cidfromdata');
 
 				$fileSize = 85;
-				print __METHOD__ . " File size must be =" . $fileSize . "\n";
+				print __METHOD__." File size must be =".$fileSize."\n";
 				$this->assertEquals(dol_filesize($localobject->html_images[$i]['fullpath']), $fileSize);
 			}
 		}

Braces +3 added lines, -2 removed lines

@@ -243,10 +243,11 @@
 		$this->assertEquals($result, 2);
 
 
-		foreach ($localobject->html_images as $i => $val)
-		if ($localobject->html_images[$i]) {
+		foreach ($localobject->html_images as $i => $val) {
+				if ($localobject->html_images[$i]) {
 			if (preg_match('/img250x20\.png/i', $localobject->html_images[$i]['fullpath'])) {
 				print __METHOD__ . " content type must be image png =" . $localobject->html_images[$i]['content_type'] . "\n";
+		}
 				$this->assertEquals($localobject->html_images[$i]['content_type'], 'image/png');
 
 				print __METHOD__ . " type must be cidfromurl =" . $localobject->html_images[$i]['type'] . "\n";