Dolibarr / dolibarr

htdocs/includes/nusoap/lib/nusoap.php

Braces +3 added lines, -6 removed lines

@@ -6508,15 +6508,13 @@ 
                                 $xml .= $this->serializeType ($eName,
                                                               isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
                                                               $v, $use, $encodingStyle, $unqualified);
-                            }
-                            elseif (isset($attrs['type']) || isset($attrs['ref']))
+                            } elseif (isset($attrs['type']) || isset($attrs['ref']))
                             {
                                 // serialize schema-defined type
                                 $xml .= $this->serializeType ($eName,
                                                               isset($attrs['type']) ? $attrs['type'] : $attrs['ref'],
                                                               $v, $use, $encodingStyle, $unqualified);
-                            }
-                            else
+                            } else
                             {
                                 // serialize generic type (can this ever really happen?)
                                 $this->debug ("calling serialize_val() for $v, $eName, false, false, false, false, $use");
@@ -7018,8 +7016,7 @@ 
                     if (isset($this->namespaces[$value_prefix]))
                     {
                         $this->message[$pos]['type_namespace'] = $this->namespaces[$value_prefix];
-                    }
-                    elseif (isset($attrs['xmlns:' . $value_prefix]))
+                    } elseif (isset($attrs['xmlns:' . $value_prefix]))
                     {
                         $this->message[$pos]['type_namespace'] = $attrs['xmlns:' . $value_prefix];
                     }

htdocs/salaries/class/api_salaries.class.php

Braces +3 added lines, -1 removed lines

@@ -444,7 +444,9 @@
 	{
 		$paymentsalary = array();
 		$fields = Salaries::$FIELDSPAYMENT;
-		if (isModEnabled("bank")) array_push($fields, "accountid");
+		if (isModEnabled("bank")) {
+			array_push($fields, "accountid");
+		}
 		foreach ($fields as $field) {
 			if (!isset($data[$field])) {
 				throw new RestException(400, "$field field missing");

htdocs/public/webportal/logout.php

Braces +3 added lines, -1 removed lines

@@ -48,7 +48,9 @@
 }
 
 // Not sure this is required
-if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) unset($_SESSION['webportal_logged_thirdparty_account_id']);
+if (isset($_SESSION['webportal_logged_thirdparty_account_id'])) {
+	unset($_SESSION['webportal_logged_thirdparty_account_id']);
+}
 
 if (GETPOST('noredirect')) {
 	return;

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' . $key . '\s--\](.*)(\[!--\sELSE\s' . $key . '\s--\](.*))?\[!--\sENDIF\s' . $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/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,22 +468,27 @@ 
 		 */
 		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;
+			}
 
 			//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/includes/geoPHP/lib/geometry/Geometry.class.php

Braces +3 added lines, -1 removed lines

@@ -60,7 +60,9 @@
 
 	public function envelope()
 	{
-		if ($this->isEmpty()) return new Polygon();
+		if ($this->isEmpty()) {
+			return new Polygon();
+		}
 
 		if ($this->geos()) {
 			return geoPHP::geosToGeometry($this->geos()->envelope());

htdocs/includes/geoPHP/lib/geometry/Collection.class.php

Braces +18 added lines, -7 removed lines

@@ -53,14 +53,17 @@ 
 	public function invertxy()
 	{
 		for ($i=0;$i<count($this->components);$i++) {
-			if ( method_exists($this->components[$i], 'invertxy') )
-			$this->components[$i]->invertxy();
+			if ( method_exists($this->components[$i], 'invertxy') ) {
+						$this->components[$i]->invertxy();
+			}
 		}
 	}
 
 	public function centroid()
 	{
-		if ($this->isEmpty()) return null;
+		if ($this->isEmpty()) {
+			return null;
+		}
 
 		if ($this->geos()) {
 			$geos_centroid = $this->geos()->centroid();
@@ -79,7 +82,9 @@ 
 
 	public function getBBox()
 	{
-		if ($this->isEmpty()) return null;
+		if ($this->isEmpty()) {
+			return null;
+		}
 
 		if ($this->geos()) {
 			$envelope = $this->geos()->envelope();
@@ -150,7 +155,9 @@ 
 	// By default, the boundary of a collection is the boundary of it's components
 	public function boundary()
 	{
-		if ($this->isEmpty()) return new LineString();
+		if ($this->isEmpty()) {
+			return new LineString();
+		}
 
 		if ($this->geos()) {
 			return $this->geos()->boundary();
@@ -224,7 +231,9 @@ 
 			return true;
 		} else {
 			foreach ($this->components as $component) {
-				if (!$component->isEmpty()) return false;
+				if (!$component->isEmpty()) {
+					return false;
+				}
 			}
 			return true;
 		}
@@ -295,7 +304,9 @@ 
 
 		// A collection is simple if all it's components are simple
 		foreach ($this->components as $component) {
-			if (!$component->isSimple()) return false;
+			if (!$component->isSimple()) {
+				return false;
+			}
 		}
 
 		return true;

htdocs/includes/geoPHP/lib/geometry/Point.class.php

Braces +3 added lines, -1 removed lines

@@ -83,7 +83,9 @@
 	{
 		if ($this->dimension == 3) {
 			return $this->coords[2];
-		} else return null;
+		} else {
+			return null;
+		}
 	}
 
 	/**

htdocs/includes/geoPHP/lib/geometry/LineString.class.php

Braces +3 added lines, -1 removed lines

@@ -62,7 +62,9 @@
 
 	public function dimension()
 	{
-		if ($this->isEmpty()) return 0;
+		if ($this->isEmpty()) {
+			return 0;
+		}
 		return 1;
 	}