Dolibarr / dolibarr

htdocs/includes/odtphp/odf.php

Braces +31 added lines, -11 removed lines

@@ -78,7 +78,10 @@ 
 		}
 
 		$md5uniqid = md5(uniqid());
-		if ($this->config['PATH_TO_TMP']) $this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);	// Remove last \ or /
+		if ($this->config['PATH_TO_TMP']) {
+			$this->tmpdir = preg_replace('|[\/]$|', '', $this->config['PATH_TO_TMP']);
+		}
+		// Remove last \ or /
 		$this->tmpdir .= ($this->tmpdir?'/':'').$md5uniqid;
 		$this->tmpfile = $this->tmpdir.'/'.$md5uniqid.'.odt';	// We keep .odt extension to allow OpenOffice usage during debug.
 
@@ -94,7 +97,9 @@ 
 
 		// Load zip proxy
 		$zipHandler = $this->config['ZIP_PROXY'];
-		if (!defined('PCLZIP_TEMPORARY_DIR')) define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
+		if (!defined('PCLZIP_TEMPORARY_DIR')) {
+			define('PCLZIP_TEMPORARY_DIR', $this->tmpdir);
+		}
 		include_once 'zip/'.$zipHandler.'.php';
 		if (! class_exists($this->config['ZIP_PROXY'])) {
 			throw new OdfException($this->config['ZIP_PROXY'] . ' class not found - check your php settings');
@@ -236,8 +241,12 @@ 
 	 */
 	private function _replaceHtmlWithOdtTag($tags, &$customStyles, &$fontDeclarations, $encode = false, $charset = '')
 	{
-		if ($customStyles == null) $customStyles = array();
-		if ($fontDeclarations == null) $fontDeclarations = array();
+		if ($customStyles == null) {
+			$customStyles = array();
+		}
+		if ($fontDeclarations == null) {
+			$fontDeclarations = array();
+		}
 
 		$odtResult = '';
 
@@ -556,10 +565,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';
@@ -600,7 +614,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);
@@ -754,7 +770,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);
@@ -822,7 +840,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/categories/viewcat.php

Braces +3 added lines, -1 removed lines

@@ -1381,7 +1381,9 @@
 				$i = 0;
 				foreach ($fichinters as $fichinter) {
 					$i++;
-					if ($i > $limit) break;
+					if ($i > $limit) {
+						break;
+					}
 
 					print "\t".'<tr class="oddeven">'."\n";
 					print '<td class="nowrap tdtop">';

test/phpunit/AccountancySystemTest.php

Braces +3 added lines, -2 removed lines

@@ -61,8 +61,9 @@
 		$mysoc = $soc;
 
 		/* Errors are caught in later tests. */
-		if ($socid <= 0)
-			return;
+		if ($socid <= 0) {
+					return;
+		}
 	}
 
 	/**

htdocs/includes/odtphp/zip/PclZipProxy.php

Braces +4 added lines, -1 removed lines

@@ -34,7 +34,10 @@
 			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
 	}
 
 	/**