Dolibarr / dolibarr

htdocs/includes/geoPHP/lib/adapters/GeoRSS.class.php

Braces +6 added lines, -2 removed lines

@@ -222,7 +222,9 @@ 
 		$output = '<'.$this->nss.'line>';
 		foreach ($geom->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($geom->numGeometries() -1)) $output .= ' ';
+			if ($k < ($geom->numGeometries() -1)) {
+				$output .= ' ';
+			}
 		}
 		$output .= '</'.$this->nss.'line>';
 		return $output;
@@ -234,7 +236,9 @@ 
 		$exterior_ring = $geom->exteriorRing();
 		foreach ($exterior_ring->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';
+			if ($k < ($exterior_ring->numGeometries() -1)) {
+				$output .= ' ';
+			}
 		}
 		$output .= '</'.$this->nss.'polygon>';
 		return $output;

htdocs/includes/geoPHP/lib/adapters/GeoJSON.class.php

Braces +3 added lines, -1 removed lines

@@ -153,9 +153,11 @@
 			'type'=> 'GeometryCollection',
 			'geometries'=> $component_array,
 			);
-		} else return array(
+		} else {
+			return array(
 		'type'=> $geometry->getGeomType(),
 		'coordinates'=> $geometry->asArray(),
 		);
+		}
 	}
 }

htdocs/includes/geoPHP/lib/adapters/GeoHash.class.php

Braces +53 added lines, -11 removed lines

@@ -98,7 +98,9 @@ 
 	 */
 	public function write(Geometry $geometry, $precision = null)
 	{
-		if ($geometry->isEmpty()) return '';
+		if ($geometry->isEmpty()) {
+			return '';
+		}
 
 		if ($geometry->geometryType() === 'Point') {
 			return $this->encodePoint($geometry, $precision);
@@ -197,19 +199,59 @@ 
 		for ($i=0,$c=strlen($hash);$i<$c;$i++) {
 			$v = strpos($this->table, $hash[$i]);
 			if (1&$i) {
-				if (16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+				if (16&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (8&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (4&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (2&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (1&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
 				$latE /= 8;
 				$lonE /= 4;
 			} else {
-				if (16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+				if (16&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (8&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (4&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (2&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (1&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
 				$latE /= 4;
 				$lonE /= 8;
 			}

htdocs/includes/geoPHP/geoPHP.inc.php

Braces +38 added lines, -13 removed lines

@@ -54,7 +54,9 @@ 
 		if (!$type) {
 			// If the user is trying to load a Geometry from a Geometry... Just pass it back
 			if (is_object($data)) {
-				if ($data instanceOf Geometry) return $data;
+				if ($data instanceOf Geometry) {
+					return $data;
+				}
 			}
 
 			$detected = geoPHP::detectFormat($data);
@@ -124,7 +126,9 @@ 
 	static function geosInstalled($force = null)
 	{
 		static $geos_installed = null;
-		if ($force !== null) $geos_installed = $force;
+		if ($force !== null) {
+			$geos_installed = $force;
+		}
 		if ($geos_installed !== null) {
 			return $geos_installed;
 		}
@@ -154,8 +158,12 @@ 
 	{
 		// If it's an array of one, then just parse the one
 		if (is_array($geometry)) {
-			if (empty($geometry)) return false;
-			if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));
+			if (empty($geometry)) {
+				return false;
+			}
+			if (count($geometry) == 1) {
+				return geoPHP::geometryReduce(array_shift($geometry));
+			}
 		}
 
 		// If the geometry cannot even theoretically be reduced more, then pass it back
@@ -233,7 +241,9 @@ 
 		$bytes = unpack("c*", fread($mem, 11));
 
 		// If bytes is empty, then we were passed empty input
-		if (empty($bytes)) return false;
+		if (empty($bytes)) {
+			return false;
+		}
 
 		// First char is a tab, space or carriage-return. trim it and try again
 		if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {
@@ -244,8 +254,11 @@ 
 		// Detect WKB or EWKB -- first byte is 1 (little endian indicator)
 		if ($bytes[1] == 1) {
 			// If SRID byte is TRUE (1), it's EWKB
-			if ($bytes[5]) return 'ewkb';
-			else return 'wkb';
+			if ($bytes[5]) {
+				return 'ewkb';
+			} else {
+				return 'wkb';
+			}
 		}
 
 		// Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)
@@ -278,12 +291,24 @@ 
 		if ($bytes[1] == 60) {
 			// grab the first 256 characters
 			$string = substr($input, 0, 256);
-			if (strpos($string, '<kml') !== false)        return 'kml';
-			if (strpos($string, '<coordinate') !== false) return 'kml';
-			if (strpos($string, '<gpx') !== false)        return 'gpx';
-			if (strpos($string, '<georss') !== false)     return 'georss';
-			if (strpos($string, '<rss') !== false)        return 'georss';
-			if (strpos($string, '<feed') !== false)       return 'georss';
+			if (strpos($string, '<kml') !== false) {
+				return 'kml';
+			}
+			if (strpos($string, '<coordinate') !== false) {
+				return 'kml';
+			}
+			if (strpos($string, '<gpx') !== false) {
+				return 'gpx';
+			}
+			if (strpos($string, '<georss') !== false) {
+				return 'georss';
+			}
+			if (strpos($string, '<rss') !== false) {
+				return 'georss';
+			}
+			if (strpos($string, '<feed') !== false) {
+				return 'georss';
+			}
 		}
 
 		// We need an 8 byte string for geohash and unpacked WKB / WKT

htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php

Braces +92 added lines, -59 removed lines

@@ -52,9 +52,11 @@ 
 		 */
 		public static function addPath($path)
 		{
-			if (false === $path = stream_resolve_include_path($path))
-			return false;
-			else set_include_path($path.PATH_SEPARATOR.get_include_path());
+			if (false === $path = stream_resolve_include_path($path)) {
+						return false;
+			} else {
+				set_include_path($path.PATH_SEPARATOR.get_include_path());
+			}
 			return $path;
 		}
 
@@ -67,16 +69,19 @@ 
 		 */
 		public static function thereCanBeOnlyOne()
 		{
-			if (static::$perfectLoaders === spl_autoload_functions())
-			return static::$instance;
+			if (static::$perfectLoaders === spl_autoload_functions()) {
+						return static::$instance;
+			}
 
-			if (false !== $loaders = spl_autoload_functions())
-			if (0 < $count = count($loaders))
+			if (false !== $loaders = spl_autoload_functions()) {
+						if (0 < $count = count($loaders))
 				for ($i = 0, static::$rogueLoaders += $loaders;
+			}
 					 $i < $count && false != ($loader = $loaders[$i]);
-					 $i++)
-					if ($loader !== static::$perfectLoaders[0])
+					 $i++) {
+									if ($loader !== static::$perfectLoaders[0])
 						spl_autoload_unregister($loader);
+				}
 
 			return static::$instance;
 		}
@@ -105,12 +110,14 @@ 
 				return false;
 			}
 
-			if (empty(static::$classMap[$key]))
-			static::$classMap[$key] = $value;
+			if (empty(static::$classMap[$key])) {
+						static::$classMap[$key] = $value;
+			}
 
-			if (is_string($alias = static::$classMap[$key]))
-			if (isset(static::$classMap[$alias]))
+			if (is_string($alias = static::$classMap[$key])) {
+						if (isset(static::$classMap[$alias]))
 				return static::$classMap[$alias];
+			}
 
 			return static::$classMap[$key];
 		}
@@ -138,8 +145,8 @@ 
 					array($dir, 'vendor', 'composer'),
 					array($dir, '..', '..', '..', 'php'),
 					array($dir, 'vendor', 'php'))
-				as $includePath)
-				if (false !== $path = stream_resolve_include_path(
+				as $includePath) {
+								if (false !== $path = stream_resolve_include_path(
 						implode($slash, $includePath)
 					))
 				if ('composer' == end($includePath) &&
@@ -150,18 +157,22 @@ 
 					static::seen(static::loadFile(
 						$classmapPath
 					));
+				}
 					$paths = array_merge(
 						$paths,
 						array_values(static::loadFile(
 							"$path{$slash}autoload_namespaces.php"
 						))
 					);
-				} else $paths[] = $path;
+				} else {
+					$paths[] = $path;
+				}
 
 				$paths = array_filter(array_map(
 				function ($path) {
-					if (false == $realPath = @realpath($path))
-						return null;
+					if (false == $realPath = @realpath($path)) {
+											return null;
+					}
 					return $realPath . DIRECTORY_SEPARATOR;
 				},
 				$paths
@@ -200,9 +211,11 @@ 
 		private function loadPrefixes($className)
 		{
 			$currentClass = $className;
-			if (false !== $pos = strrpos($className, '\\'))
-			$className = substr($className, $pos);
-			else $className = "\\$className";
+			if (false !== $pos = strrpos($className, '\\')) {
+						$className = substr($className, $pos);
+			} else {
+				$className = "\\$className";
+			}
 
 			for (
 			$i = 0,
@@ -231,12 +244,13 @@ 
 		private function loadAliases($className)
 		{
 			$file = false;
-			if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts))
-			for (
+			if (preg_match('/(.+)(\\\\\w+$)/U', $className, $parts)) {
+						for (
 				$i = 0,
 				$aliases = isset(static::$aliases[$parts[1]])
 					? static::$aliases[$parts[1]] : array(),
 				$count = count($aliases);
+			}
 				$i < $count && false === $file;
 				$file = $this->discover(
 					"{$aliases[$i++]}$parts[2]",
@@ -263,13 +277,15 @@ 
 		{
 			$loaders = array_unique(static::$rogueLoaders, SORT_REGULAR);
 			if (isset($loader)) {
-				if (false === array_search($loader, $loaders))
-				static::$rogueLoaders[] = $loader;
+				if (false === array_search($loader, $loaders)) {
+								static::$rogueLoaders[] = $loader;
+				}
 				return $this->loadThisLoader($className, $loader);
 			}
-			foreach ($loaders as $loader)
-				if (false !== $file = $this->loadThisLoader($className, $loader))
+			foreach ($loaders as $loader) {
+							if (false !== $file = $this->loadThisLoader($className, $loader))
 					return $file;
+			}
 
 			return false;
 		}
@@ -342,13 +358,18 @@ 
 		 */
 		private function alias($className, $currentClass)
 		{
-			if ($className == 'Luracast\Restler\string') return;
-			if ($className == 'Luracast\Restler\mixed') return;
+			if ($className == 'Luracast\Restler\string') {
+				return;
+			}
+			if ($className == 'Luracast\Restler\mixed') {
+				return;
+			}
 			if ($className != $currentClass
-			&& false !== strpos($className, $currentClass))
-				if (!class_exists($currentClass, false)
+			&& false !== strpos($className, $currentClass)) {
+							if (!class_exists($currentClass, false)
 					&& class_alias($className, $currentClass))
 						static::seen($currentClass, $className);
+			}
 		}
 
 		/**
@@ -366,11 +387,12 @@ 
 
 			/** The short version we've done this before and found it in cache */
 			if (false !== $file = static::seen($className)) {
-				if (!$this->exists($className))
-				if (is_callable($file))
+				if (!$this->exists($className)) {
+								if (is_callable($file))
 					$file = $this->loadLastResort($className, $file);
-				elseif ($file = stream_resolve_include_path($file))
-					$file = static::loadFile($file);
+				} elseif ($file = stream_resolve_include_path($file)) {
+									$file = static::loadFile($file);
+				}
 
 				$this->alias($className, $currentClass);
 				return $file;
@@ -380,15 +402,17 @@ 
 
 			/** replace \ with / and _ in CLASS NAME with / = PSR-0 in 3 lines */
 			$file = preg_replace("/\\\|_(?=\w+$)/", DIRECTORY_SEPARATOR, $className);
-			if (false === $file = stream_resolve_include_path("$file.php"))
-			return false;
+			if (false === $file = stream_resolve_include_path("$file.php")) {
+						return false;
+			}
 
 			/** have we loaded this file before could this be an alias */
 			if (in_array($file, get_included_files())) {
-				if (false !== $sameFile = array_search($file, static::$classMap))
-				if (!$this->exists($className, $file))
+				if (false !== $sameFile = array_search($file, static::$classMap)) {
+								if (!$this->exists($className, $file))
 					if (false !== strpos($sameFile, $className))
 						$this->alias($sameFile, $className);
+				}
 
 				return $file;
 			}
@@ -396,17 +420,19 @@ 
 			$state = array_merge(get_declared_classes(), get_declared_interfaces());
 
 			if (false !== $result = static::loadFile($file)) {
-				if ($this->exists($className, $file))
-				$this->alias($className, $currentClass);
-				elseif (false != $diff = array_diff(
-				array_merge(get_declared_classes(), get_declared_interfaces()), $state))
-				foreach ($diff as $autoLoaded)
+				if ($this->exists($className, $file)) {
+								$this->alias($className, $currentClass);
+				} elseif (false != $diff = array_diff(
+				array_merge(get_declared_classes(), get_declared_interfaces()), $state)) {
+								foreach ($diff as $autoLoaded)
 					if ($this->exists($autoLoaded, $file))
 						if (false !== strpos($autoLoaded, $className))
 							$this->alias($autoLoaded, $className);
+				}
 
-				if (!$this->exists($currentClass))
-				$result = false;
+				if (!$this->exists($currentClass)) {
+								$result = false;
+				}
 			}
 
 			return $result;
@@ -424,10 +450,12 @@ 
 		private function exists($className, $mapping = null)
 		{
 			if (class_exists($className, false)
-			|| interface_exists($className, false))
-			if (isset($mapping))
+			|| interface_exists($className, false)) {
+						if (isset($mapping))
 				return static::seen($className, $mapping);
-			else return true;
+			} else {
+				return true;
+			}
 			return false;
 		}
 
@@ -440,23 +468,28 @@ 
 		 */
 		public function __invoke($className)
 		{
-			if (empty($className))
-			return false;
+			if (empty($className)) {
+						return false;
+			}
 
-			if (false !== $includeReference = $this->discover($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->discover($className)) {
+						return $includeReference;
+			}
 
 			// @CHANGE LDR Reduce cases of conflicts with the messy autoload
 			//static::thereCanBeOnlyOne();
 
-			if (false !== $includeReference = $this->loadAliases($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->loadAliases($className)) {
+						return $includeReference;
+			}
 
-			if (false !== $includeReference = $this->loadPrefixes($className))
-			return $includeReference;
+			if (false !== $includeReference = $this->loadPrefixes($className)) {
+						return $includeReference;
+			}
 
-			if (false !== $includeReference = $this->loadLastResort($className))
-				return $includeReference;
+			if (false !== $includeReference = $this->loadLastResort($className)) {
+							return $includeReference;
+			}
 
 			static::seen($className, true);
 			return null;

htdocs/public/fichinter/agendaexport.php

Braces +12 added lines, -8 removed lines

@@ -585,19 +585,23 @@
 				$duration = $obj->duree;
 				$event['location'] = ($obj->socname ? $obj->socname : "");
 				$event['summary'] = $obj->ref." - ". $obj->description;
-				if ($obj->ref_client)
-				$event['summary'].= " (".$obj->ref_client.")";
+				if ($obj->ref_client) {
+								$event['summary'].= " (".$obj->ref_client.")";
+				}
 
 				$event['desc'] = $obj->description;
 
-				if ($obj->ref_project)
-					$event['desc'] .= " - ".$obj->ref_project;
+				if ($obj->ref_project) {
+									$event['desc'] .= " - ".$obj->ref_project;
+				}
 
-				if ($obj->ref_contract)
-					$event['desc'] .= " - ".$obj->ref_contract;
+				if ($obj->ref_contract) {
+									$event['desc'] .= " - ".$obj->ref_contract;
+				}
 
-				if ($obj->note_public)
-					$event['desc'].= " - ".$obj->note_public;
+				if ($obj->note_public) {
+									$event['desc'].= " - ".$obj->note_public;
+				}
 
 				$event['startdate'] = $datestart;
 				$event['enddate'] = ''; // $dateend; // Not required with type 'journal'

htdocs/includes/parsedown/Parsedown.php

Braces +18 added lines, -36 removed lines

@@ -213,8 +213,7 @@ 
 					$CurrentBlock = $Block;
 
 					continue;
-				}
-				else
+				} else
 				{
 					if ($this->isBlockCompletable($CurrentBlock['type']))
 					{
@@ -282,8 +281,7 @@ 
 			if (isset($Block))
 			{
 				$CurrentBlock = $Block;
-			}
-			else
+			} else
 			{
 				if (isset($CurrentBlock))
 				{
@@ -323,8 +321,7 @@ 
 			if (isset($Component['markup']))
 			{
 				$Component['element'] = array('rawHtml' => $Component['markup']);
-			}
-			elseif (isset($Component['hidden']))
+			} elseif (isset($Component['hidden']))
 			{
 				$Component['element'] = array();
 			}
@@ -584,8 +581,7 @@ 
 				$contentIndent -= 1;
 				$matches[1] = substr($matches[1], 0, -$contentIndent);
 				$matches[3] = str_repeat(' ', $contentIndent) . $matches[3];
-			}
-			elseif ($contentIndent === 0)
+			} elseif ($contentIndent === 0)
 			{
 				$matches[1] .= ' ';
 			}
@@ -687,8 +683,7 @@ 
 				$Block['element']['elements'] []= & $Block['li'];
 
 				return $Block;
-			}
-			elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line))
+			} elseif ($Line['indent'] < $requiredIndent and $this->blockList($Line))
 			{
 				return null;
 			}
@@ -1316,12 +1311,10 @@ 
 		if ($Excerpt['text'][1] === $marker and preg_match($this->StrongRegex[$marker], $Excerpt['text'], $matches))
 		{
 			$emphasis = 'strong';
-		}
-		elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
+		} elseif (preg_match($this->EmRegex[$marker], $Excerpt['text'], $matches))
 		{
 			$emphasis = 'em';
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -1412,8 +1405,7 @@ 
 			$extent += strlen($matches[0]);
 
 			$remainder = substr($remainder, $extent);
-		}
-		else
+		} else
 		{
 			return;
 		}
@@ -1428,8 +1420,7 @@ 
 			}
 
 			$extent += strlen($matches[0]);
-		}
-		else
+		} else
 		{
 			if (preg_match('/^\s*\[(.*?)\]/', $remainder, $matches))
 			{
@@ -1437,8 +1428,7 @@ 
 				$definition = strtolower($definition);
 
 				$extent += strlen($matches[0]);
-			}
-			else
+			} else
 			{
 				$definition = strtolower($Element['handler']['argument']);
 			}
@@ -1603,8 +1593,7 @@ 
 				$argument = $Element['text'];
 				unset($Element['text']);
 				$destination = 'rawHtml';
-			}
-			else
+			} else
 			{
 				$function = $Element['handler']['function'];
 				$argument = $Element['handler']['argument'];
@@ -1641,8 +1630,7 @@ 
 		if (isset($Element['elements']))
 		{
 			$Element['elements'] = $this->elementsApplyRecursive($closure, $Element['elements']);
-		}
-		elseif (isset($Element['element']))
+		} elseif (isset($Element['element']))
 		{
 			$Element['element'] = $this->elementApplyRecursive($closure, $Element['element']);
 		}
@@ -1655,8 +1643,7 @@ 
 		if (isset($Element['elements']))
 		{
 			$Element['elements'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['elements']);
-		}
-		elseif (isset($Element['element']))
+		} elseif (isset($Element['element']))
 		{
 			$Element['element'] = $this->elementsApplyRecursiveDepthFirst($closure, $Element['element']);
 		}
@@ -1743,26 +1730,22 @@ 
 			if (isset($Element['elements']))
 			{
 				$markup .= $this->elements($Element['elements']);
-			}
-			elseif (isset($Element['element']))
+			} elseif (isset($Element['element']))
 			{
 				$markup .= $this->element($Element['element']);
-			}
-			else
+			} else
 			{
 				if (!$permitRawHtml)
 				{
 					$markup .= self::escape($text, true);
-				}
-				else
+				} else
 				{
 					$markup .= $text;
 				}
 			}
 
 			$markup .= $hasName ? '</' . $Element['name'] . '>' : '';
-		}
-		elseif ($hasName)
+		} elseif ($hasName)
 		{
 			$markup .= ' />';
 		}
@@ -1928,8 +1911,7 @@ 
 		if ($len > strlen($string))
 		{
 			return false;
-		}
-		else
+		} else
 		{
 			return strtolower(substr($string, 0, $len)) === strtolower($needle);
 		}

htdocs/includes/odtphp/Segment.php

Braces +12 added lines, -4 removed lines

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

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