Dolibarr / dolibarr

test/phpunit/CMailFileTest.php

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

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;
 		}
@@ -313,13 +329,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);
+			}
 		}
 
 		/**
@@ -337,11 +358,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;
@@ -351,15 +373,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;
 			}
@@ -367,17 +391,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;
@@ -395,10 +421,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;
 		}
 
@@ -411,22 +439,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/comm/action/class/cactioncomm.class.php

Braces +9 added lines, -3 removed lines

@@ -327,10 +327,16 @@
 				}
 			}
 
-			if (empty($idorcode)) $idorcode = 'all';
+			if (empty($idorcode)) {
+				$idorcode = 'all';
+			}
 			$TType = $TSystem[$idorcode];
-			if (! empty($TSystemAuto[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TSystemAuto[$idorcode]);
-			if (! empty($TModule[$idorcode])) $TType = array_merge($TSystem[$idorcode], $TModule[$idorcode]);
+			if (! empty($TSystemAuto[$idorcode])) {
+				$TType = array_merge($TSystem[$idorcode], $TSystemAuto[$idorcode]);
+			}
+			if (! empty($TModule[$idorcode])) {
+				$TType = array_merge($TSystem[$idorcode], $TModule[$idorcode]);
+			}
 			$this->liste_array = $TType;
 
 

htdocs/webportal/class/context.class.php

Braces +18 added lines, -6 removed lines

@@ -321,7 +321,9 @@ 
 
 		// if $moreParams is an array
 		if (!empty($moreParams) && is_array($moreParams)) {
-			if (isset($moreParams['controller'])) unset($moreParams['controller']);
+			if (isset($moreParams['controller'])) {
+				unset($moreParams['controller']);
+			}
 			if (!empty($moreParams)) {
 				foreach ($moreParams as $paramKey => $paramVal) {
 					$Tparams[$paramKey] = $paramVal;
@@ -340,8 +342,12 @@ 
 		// if $moreParams is a string
 		if (!empty($moreParams) && !is_array($moreParams)) {
 			if (empty($Tparams)) {
-				if ($moreParams[0] !== '?') $url .= '?';
-				if ($moreParams[0] === '&') $moreParams = substr($moreParams, 1);
+				if ($moreParams[0] !== '?') {
+					$url .= '?';
+				}
+				if ($moreParams[0] === '&') {
+					$moreParams = substr($moreParams, 1);
+				}
 			}
 			$url .= $moreParams;
 		}
@@ -410,10 +416,16 @@ 
 	 */
 	public function setError($errors)
 	{
-		if (!is_array($errors)) $errors = array($errors);
-		if (!isset($_SESSION['webportal_errors'])) $_SESSION['webportal_errors'] = array();
+		if (!is_array($errors)) {
+			$errors = array($errors);
+		}
+		if (!isset($_SESSION['webportal_errors'])) {
+			$_SESSION['webportal_errors'] = array();
+		}
 		foreach ($errors as $msg) {
-			if (!in_array($msg, $_SESSION['webportal_errors'])) $_SESSION['webportal_errors'][] = $msg;
+			if (!in_array($msg, $_SESSION['webportal_errors'])) {
+				$_SESSION['webportal_errors'][] = $msg;
+			}
 		}
 	}
 

htdocs/public/webportal/webportal.main.inc.php

Braces +26 added lines, -7 removed lines

@@ -40,12 +40,29 @@ 
 
 // Change this following line to use the correct relative path (../, ../../, etc)
 $res = 0;
-if (!$res && file_exists('../../main.inc.php')) $res = @include '../../main.inc.php';                // to work if your module directory is into dolibarr root htdocs directory
-if (!$res && file_exists('../../../main.inc.php')) $res = @include '../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../main.inc.php')) $res = @include '../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../../main.inc.php')) $res = @include '../../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res && file_exists('../../../../../../main.inc.php')) $res = @include '../../../../../../main.inc.php';            // to work if your module directory is into a subdir of root htdocs directory
-if (!$res) die('Include of main fails');
+if (!$res && file_exists('../../main.inc.php')) {
+	$res = @include '../../main.inc.php';
+}
+// to work if your module directory is into dolibarr root htdocs directory
+if (!$res && file_exists('../../../main.inc.php')) {
+	$res = @include '../../../main.inc.php';
+}
+// to work if your module directory is into a subdir of root htdocs directory
+if (!$res && file_exists('../../../../main.inc.php')) {
+	$res = @include '../../../../main.inc.php';
+}
+// to work if your module directory is into a subdir of root htdocs directory
+if (!$res && file_exists('../../../../../main.inc.php')) {
+	$res = @include '../../../../../main.inc.php';
+}
+// to work if your module directory is into a subdir of root htdocs directory
+if (!$res && file_exists('../../../../../../main.inc.php')) {
+	$res = @include '../../../../../../main.inc.php';
+}
+// to work if your module directory is into a subdir of root htdocs directory
+if (!$res) {
+	die('Include of main fails');
+}
 require_once DOL_DOCUMENT_ROOT . '/user/class/user.class.php';
 require_once DOL_DOCUMENT_ROOT . '/societe/class/societeaccount.class.php';
 dol_include_once('/public/webportal/lib/webportal.lib.php');
@@ -113,7 +130,9 @@ 
 			}
 			if (empty($password)) {
 				$context->setEventMessage($langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Password")), 'errors');
-				if (empty($focus_element)) $focus_element = 'password';
+				if (empty($focus_element)) {
+					$focus_element = 'password';
+				}
 				$error++;
 			}
 			// check security graphic code

htdocs/public/webportal/tpl/menu.tpl.php

Braces +3 added lines, -1 removed lines

@@ -112,7 +112,9 @@
 );
 
 $reshook = $hookmanager->executeHooks('PrintTopMenu', $parameters, $context, $context->action);    // Note that $action and $object may have been modified by hook
-if ($reshook < 0) $context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+if ($reshook < 0) {
+	$context->setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
+}
 
 if (empty($reshook)) {
 	if (!empty($hookmanager->resArray)) {

htdocs/public/webportal/logout.php

Braces +10 added lines, -3 removed lines

@@ -35,8 +35,13 @@ 
 
 // Change this following line to use the correct relative path (../, ../../, etc)
 $res = 0;
-if (!$res && file_exists('./webportal.main.inc.php')) $res = @include './webportal.main.inc.php';                // to work if your module directory is into dolibarr root htdocs directory
-if (!$res) die('Include of WebPortal main fails');
+if (!$res && file_exists('./webportal.main.inc.php')) {
+	$res = @include './webportal.main.inc.php';
+}
+// to work if your module directory is into dolibarr root htdocs directory
+if (!$res) {
+	die('Include of WebPortal main fails');
+}
 
 global $db;
 
@@ -50,7 +55,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/public/webportal/index.php

Braces +7 added lines, -2 removed lines

@@ -2,8 +2,13 @@
 
 // Change this following line to use the correct relative path (../, ../../, etc)
 $res = 0;
-if (!$res && file_exists('./webportal.main.inc.php')) $res = @include './webportal.main.inc.php';                // to work if your module directory is into dolibarr root htdocs directory
-if (!$res) die('Include of WebPortal main fails');
+if (!$res && file_exists('./webportal.main.inc.php')) {
+	$res = @include './webportal.main.inc.php';
+}
+// to work if your module directory is into dolibarr root htdocs directory
+if (!$res) {
+	die('Include of WebPortal main fails');
+}
 
 /** @var Context $context */
 

htdocs/compta/facture/card.php

Braces +10 added lines, -4 removed lines

@@ -2313,10 +2313,16 @@
 				$type = $prod->type;
 				$fk_unit = $prod->fk_unit;
 			} else {
-				if (!empty($price_ht)) $pu_ht = price2num($price_ht, 'MU');
-				else $pu_ht = '';
-				if (!empty($price_ttc)) $pu_ttc = price2num($price_ttc, 'MU');
-				else $pu_ttc = '';
+				if (!empty($price_ht)) {
+					$pu_ht = price2num($price_ht, 'MU');
+				} else {
+					$pu_ht = '';
+				}
+				if (!empty($price_ttc)) {
+					$pu_ttc = price2num($price_ttc, 'MU');
+				} else {
+					$pu_ttc = '';
+				}
 				$tva_npr = (preg_match('/\*/', $tva_tx) ? 1 : 0);
 				$tva_tx = str_replace('*', '', $tva_tx);
 				if (empty($tva_tx)) {